(cherry picked from commit f754b081ce45b9c418986778e24b6a3265ba7735) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt # app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
(cherry picked from commit f754b081ce45b9c418986778e24b6a3265ba7735) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt # app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt