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

..

src

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

2018-03-13 15:58:47 -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-03-13 15:58:47 -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