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
..
aps	:plugins:aps cleanup	2023-09-26 10:23:01 +02:00
automation	:profile:main cleanup	2023-09-26 14:44:52 +02:00
configuration	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-09-26 20:43:15 +02:00
constraints	:plugins:source cleanup	2023-09-26 16:31:08 +02:00
insulin	:plugins:insulin cleanup	2023-09-26 13:07:44 +02:00
main	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-09-26 20:43:15 +02:00
sensitivity	:plugins:sensitivity cleanup	2023-09-26 16:21:47 +02:00
smoothing	:plugins:smoothing cleanup	2023-09-26 16:24:49 +02:00
source	:plugins:source cleanup	2023-09-26 16:31:08 +02:00
sync	:plugins:sync cleanup	2023-09-26 16:52:44 +02:00