(cherry picked from commit 4ee1d72b6f8278d84da6f75d218a51261d175e18) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt (cherry picked from commit bcf93989877ecf0d09f4a3d28584c107aacf9393)
(cherry picked from commit 4ee1d72b6f8278d84da6f75d218a51261d175e18) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt (cherry picked from commit bcf93989877ecf0d09f4a3d28584c107aacf9393)