
(cherry picked from commit 2d19729869d1c88a46c0d1a4582d29a80d7ab9cb) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
(cherry picked from commit 2d19729869d1c88a46c0d1a4582d29a80d7ab9cb) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt