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

# Conflicts:
#	.travis.yml
#	README.md
#	app/build.gradle
#	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-04-14 21:11:29 -04:00

..

gradle-wrapper.jar

Upstream merge

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

gradle-wrapper.properties

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

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