mihon/app/src/main/java/eu/kanade/tachiyomi/ui
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
..
base Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
catalogue Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
category Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
download Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
extension Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
library Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
main Fix shortcuts popping up library sheet or duplicating controllers in backstack 2020-04-02 19:46:44 -04:00
manga Change color of 'last page read' in chapter description (#2855) 2020-04-10 08:37:58 -04:00
migration Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
more Minor edits 2020-03-29 16:41:14 -04:00
reader Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins 2020-04-10 11:14:09 -04:00
recent Migrate to ViewBinding from Kotlin synthetics in controllers 2020-04-08 23:06:28 -04:00
security Fix secure screen option subscription memory leak 2020-03-09 14:03:47 -04:00
setting Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins 2020-04-10 11:14:09 -04:00
webview Migrate to ViewBinding in WebviewActivity 2020-04-10 10:02:51 -04:00