Skip to content
Snippets Groups Projects
Commit 96cd3def authored by Tamás Szabó's avatar Tamás Szabó
Browse files

Merge branch 'development' into room

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/build.gradle
#	app/src/main/java/me/szaki/xkcd/xkcdbrowser/XKCDBrowserApplicationComponent.java
#	app/src/main/java/me/szaki/xkcd/xkcdbrowser/ui/favorites/FavoritesPresenter.java
#	app/src/main/java/me/szaki/xkcd/xkcdbrowser/ui/main/MainPresenter.java
parents 29f5bbdb 57498ead
No related branches found
No related tags found
2 merge requests!7implement room database,!9labor5
Showing
with 1253 additions and 1 deletion
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment