(cherry picked from commit 54cfb2acdfbdb29156e8053bdbd3e2fdfe3f6a43) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||