Philoul bade105725 Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface ... # Conflicts: # wear/src/main/kotlin/app/aaps/wear/watchfaces/CustomWatchface.kt		2023-09-26 20:43:15 +02:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-09-26 20:43:15 +02:00
.gitignore	move SetupWizard	2022-11-21 16:48:45 +01:00
build.gradle	:plugins:configuration cleanup	2023-09-26 12:44:36 +02:00
consumer-rules.pro	move SetupWizard	2022-11-21 16:48:45 +01:00
proguard-rules.pro	move SetupWizard	2022-11-21 16:48:45 +01:00