arkon 8b8b377c29 Group advanced settings ... (cherry picked from commit a2ece821971576b56de56a3e5e6da11da6c48f4f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt		2020-05-23 16:04:21 -04:00
..
src	Group advanced settings	2020-05-23 16:04:21 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Update the coroutine dependency and fix issues that were causing the crash	2020-05-23 00:57:41 -04:00
proguard-rules.pro	merge double upstream	2020-05-02 23:39:46 -04:00
shortcuts.xml	Merge sources and extensions into one view	2020-04-27 19:16:46 -04:00