Files
mihon/app/src
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
..