989119af17
(cherry picked from commit 996f770935)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 996f770935)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt