Philoul a7649fd4a8 Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface ... # Conflicts: # wear/src/main/kotlin/app/aaps/wear/watchfaces/CustomWatchface.kt		2023-10-16 10:19:15 +02:00
..
main	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-10-16 10:19:15 +02:00
test/kotlin/app/aaps/wear	:app :wear cleanup	2023-09-26 18:29:58 +02:00