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
..
src	Merge reader settings and color filter sheets	2021-03-28 17:19:57 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle.kts	Update dependancies	2021-03-22 20:11:43 -04:00
proguard-rules.pro	Enable the proguard rules	2020-10-13 21:53:23 -04:00
shortcuts.xml	Merge sources and extensions into one view	2020-04-27 19:16:46 -04:00