arkon 145a744ce0 Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins ...

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt
#	app/src/main/res/values/strings.xml

2020-04-10 11:14:09 -04:00

..

src

Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins

2020-04-10 11:14:09 -04:00

.gitignore

Run downloader in foreground service

2018-04-28 10:54:27 +02:00

build.gradle

Migrate to ViewBinding from Kotlin synthetics in controllers

2020-04-08 23:06:28 -04:00

proguard-rules.pro

Update Proguard rules

2020-03-02 21:45:16 -05:00

shortcuts.xml

Update library shortcut icon

2020-04-07 17:01:42 -04:00