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
..
main	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-09-20 23:11:54 +02:00
test/java/info/nightscout/androidaps	Merge remote-tracking branch 'origin/dev' into refactor	2023-09-19 14:47:18 +02:00