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
..
data	Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins	2020-04-10 11:14:09 -04:00
extension	Show error toast when extensions list fails to load	2020-04-03 22:54:52 -04:00
network	Add an UserAgent Interceptor to Cloudflare Client (#2685)	2020-03-09 14:10:10 -04:00
source	Using extension icon instead of letter for catalogues (closes #2261)	2020-04-01 23:03:20 -04:00
ui	Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins	2020-04-10 11:14:09 -04:00
util	Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins	2020-04-10 11:14:09 -04:00
widget	Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins	2020-04-10 11:14:09 -04:00
App.kt	Migrate to WorkManager	2020-03-01 13:22:16 -05:00
AppModule.kt	More linting fixes	2020-02-26 18:12:44 -05:00
Migrations.kt	Minor extension update cleanup, default to on	2020-03-20 22:59:59 -04:00