(cherry picked from commit 3d7c136320da3b5842a51d7dbb9e82cf74144f3f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt (cherry picked from commit 85224c368d6a6886b7eb0794b4c40671973daba0)
(cherry picked from commit 3d7c136320da3b5842a51d7dbb9e82cf74144f3f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt (cherry picked from commit 85224c368d6a6886b7eb0794b4c40671973daba0)