
(cherry picked from commit 3319ccfd41a75b5c80a4b05aa2a9f41e1739a50f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 3319ccfd41a75b5c80a4b05aa2a9f41e1739a50f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt