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

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
#	app/src/main/res/layout/manga_info_controller.xml
#	app/src/main/res/raw/changelog_release.xml

2018-03-13 15:58:47 -04:00

..

eu/kanade/tachiyomi

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

2018-03-13 15:58:47 -04:00

exh

Attempt to add hitomi.la source (still broken) and code cleanup

2018-03-13 15:21:31 -04:00