(cherry picked from commit 092d930175e7a9a6e1bb73f8d97948903db06d67) (cherry picked from commit f25b70cdef339b4bdf90006eff9a75be7a46fd0a) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/NetworkPreferences.kt
(cherry picked from commit 092d930175e7a9a6e1bb73f8d97948903db06d67) (cherry picked from commit f25b70cdef339b4bdf90006eff9a75be7a46fd0a) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/NetworkPreferences.kt