(cherry picked from commit 1813dbbf590447861591f41c225007a451bb3e83) # Conflicts: # app/build.gradle # app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt |
||
|---|---|---|
| .. | ||
| track | ||
| SettingsAdvancedController.kt | ||
| SettingsBackupController.kt | ||
| SettingsBrowseController.kt | ||
| SettingsController.kt | ||
| SettingsDownloadController.kt | ||
| SettingsEhController.kt | ||
| SettingsGeneralController.kt | ||
| SettingsHlController.kt | ||
| SettingsLibraryController.kt | ||
| SettingsMainController.kt | ||
| SettingsNhController.kt | ||
| SettingsReaderController.kt | ||
| SettingsSecurityController.kt | ||
| SettingsTrackingController.kt | ||