NerdNumber9 234c3bb72a Merge branch 'master' of https://github.com/inorichi/tachiyomi ...

# Conflicts:
#	README.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt

2018-04-15 13:39:29 -04:00

..

src

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2018-04-15 13:39:29 -04:00

.gitignore

Upstream merge

2017-05-04 23:38:17 -04:00

build.gradle

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2018-04-14 21:11:29 -04:00

proguard-rules.pro

Merge upstream changes

2017-11-29 21:53:02 -05:00

shortcuts.xml

Update Android Studio to 3.0

2017-10-28 14:44:19 +02:00