39e36f957d
(cherry picked from commit 6cd34614f6)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
(cherry picked from commit 6cd34614f6)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt