makiolaj
fe17bcc8e8
Merge branch 'feat/29-world-clock-list' into release/v1.0.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/clockula/data/prefs/SettingsPrefs.kt
# app/src/main/java/de/jeanlucmakiola/clockula/ui/settings/ClockSettingsScreen.kt
# app/src/main/java/de/jeanlucmakiola/clockula/ui/settings/SettingsViewModel.kt
# app/src/main/res/values/strings.xml
# app/src/test/java/de/jeanlucmakiola/clockula/backup/BackupEngineTest.kt
# app/src/test/java/de/jeanlucmakiola/clockula/ui/settings/SettingsViewModelTest.kt
# docs/ARCHITECTURE.md
2026-11-02 19:30:34 +01:00
..
2026-10-21 20:16:34 +02:00
2026-11-02 19:30:34 +01:00
2026-09-11 11:46:42 +02:00
2026-11-02 18:53:09 +01:00
2026-10-02 22:33:20 +02:00