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