arkon c35e0a0c29 Unhide parental controls settings ... (cherry picked from commit c3084ac43ab401ecb799700c5a7dcff1c14f7db0) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt		2020-08-14 18:41:13 -04:00
..
src	Unhide parental controls settings	2020-08-14 18:41:13 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Slight gradle cleanup, plugin updates	2020-08-14 18:41:13 -04:00
proguard-rules.pro	Likely fix Hitomi extension	2020-08-11 01:35:36 -04:00
shortcuts.xml	Merge sources and extensions into one view	2020-04-27 19:16:46 -04:00