(cherry picked from commit 5467104b955fc854285f22f9be56083a1d503144) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
(cherry picked from commit 5467104b955fc854285f22f9be56083a1d503144) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt