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