arkon 709f76d53d Merge reader settings and color filter sheets
Heavily influenced by fe2543b9d5 (diff-8f47d7b7b53769ac18c28fe9978140c6bef44709879567acab2c6ef3270cd3a8)

(cherry picked from commit e0b7698d40678ccebfe6b546af9101c11c3a06c5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_settings_sheet.xml
2021-03-28 17:19:57 -04:00
..
2020-05-02 23:39:46 -04:00
2020-05-02 23:39:46 -04:00
2020-10-25 20:19:02 -04:00
2020-10-25 20:19:02 -04:00
2020-07-16 17:27:47 -04:00
2020-06-01 23:44:56 -04:00
2020-10-11 15:34:34 -04:00
2020-08-22 17:37:42 -04:00
2020-05-02 23:39:46 -04:00
2020-05-25 14:14:37 -04:00
2021-01-31 19:38:45 -05:00