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