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
..
arrays.xml	Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins	2020-04-10 11:14:09 -04:00
attrs.xml	Move filter icon tint color to resources	2020-03-15 11:05:11 -04:00
colors.xml	Pure white light theme	2020-03-15 11:36:38 -04:00
dimens.xml	Remove unused navigation header dimens	2020-02-27 19:51:27 -05:00
ids.xml	Give view pager unique ids, avoiding subtle bugs	2017-12-04 22:22:35 +01:00
strings.xml	Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins	2020-04-10 11:14:09 -04:00
styles.xml	Use colorSecondary for text field cursor (fixes #2853)	2020-04-10 10:43:39 -04:00
themes.xml	Tweak dark theme snackbar (closes #2699)	2020-04-05 13:55:42 -04:00