
(cherry picked from commit f63573f25fe5361c9c1a49a77b2c371e68072736) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt # app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt
(cherry picked from commit f63573f25fe5361c9c1a49a77b2c371e68072736) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt # app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt