Closes #3136 (cherry picked from commit 5bba7af24aa0b8c5d66baa1f26a8427ceec8a4ae) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/RestoreOptions.kt # core/build.gradle.kts |
||
|---|---|---|
| .. | ||
| main | ||
| test/kotlin/tachiyomi/core/util/lang | ||