
(cherry picked from commit 793d7fbe40c87ed233da8cc99d544d01024ed4f5) # Conflicts: # CHANGELOG.md # app/src/main/java/eu/kanade/tachiyomi/App.kt # core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
(cherry picked from commit 793d7fbe40c87ed233da8cc99d544d01024ed4f5) # Conflicts: # CHANGELOG.md # app/src/main/java/eu/kanade/tachiyomi/App.kt # core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt