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