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

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/NoResultsException.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

2017-12-07 23:20:27 -05:00

..

arrays.xml

Migrate to Tachiyomi 6.1

2017-08-24 12:28:54 -04:00

attrs.xml

Merge upstream changes

2017-11-29 21:53:02 -05:00

colors.xml

Merge upstream changes

2017-11-29 21:53:02 -05:00

dimens.xml

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

2017-08-24 11:24:23 -04:00

ids.xml

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

2017-12-07 23:20:27 -05:00

keys.xml

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

2017-08-24 11:24:23 -04:00

strings.xml

Merge upstream changes

2017-11-29 21:53:02 -05:00

styles.xml

Merge upstream changes

2017-11-29 21:53:02 -05:00

themes.xml

Merge upstream changes

2017-11-29 21:53:02 -05:00