komikku/.github
NerdNumber9 71c10df270 Merge branch 'master' of https://github.com/inorichi/tachiyomi
# Conflicts:
#	README.md
#	app/.gitignore
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt
#	app/src/main/res/raw/changelog_release.xml
2018-06-09 19:52:02 -04:00
..
readme-images Add Tsumino captcha display and merge branch 'master' of upstream 2018-02-24 11:13:43 -05:00
CONTRIBUTING.md Merge branch 'master' of https://github.com/inorichi/tachiyomi 2018-06-09 19:52:02 -04:00
ISSUE_TEMPLATE.md Add Tsumino captcha display and merge branch 'master' of upstream 2018-02-24 11:13:43 -05:00