5 Commits

Author SHA1 Message Date
NerdNumber9
8c8f2585aa Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateDownloaderReceiver.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
#	app/src/main/res/menu/library.xml
#	app/src/main/res/values/strings.xml
#	app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt
2018-01-29 12:16:32 -05:00
inorichi
233dbec4b3 Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
NerdNumber9
9dbb59f337 Upstream merge
Internal permission change
Fix url adder
2017-05-04 23:38:17 -04:00
len
e9a6f8ef46 Update app icon with shadow 2017-03-26 11:42:32 +02:00
inorichi
5bb72429ea Adding a new logo, finally! Thanks @LinkCable 2016-01-15 02:42:10 +01:00