arkon cf99ee73f5 Break out NSFW hiding/labeling into separate settings ... (cherry picked from commit 5b09461ccf76963fef844d7550383205e8d33010) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt		2020-12-21 14:21:31 -05:00
..
src	Break out NSFW hiding/labeling into separate settings	2020-12-21 14:21:31 -05:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle	Release 1.4.0	2020-12-12 13:27:13 -05: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