Philoul 23cb374ab3 Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface ... # Conflicts: # wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt		2023-09-20 23:11:54 +02:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-09-20 23:11:54 +02:00
.gitignore	modules cleanup	2022-11-25 22:14:46 +01:00
build.gradle	eliminate :app-wear-shared:shared	2023-09-18 23:58:37 +02:00
consumer-rules.pro	modules cleanup	2022-11-25 22:14:46 +01:00
proguard-rules.pro	modules cleanup	2022-11-25 22:14:46 +01:00