Philoul 11d0bce4ef Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface ... # Conflicts: # build.gradle		2023-08-26 23:12:34 +02:00
..
debug/java/info/nightscout/androidaps/annotations	Rx module	2022-11-06 12:28:35 +01:00
main	Merge remote-tracking branch 'Nightscout/dev' into wear/new_custom_watchface	2023-08-26 23:12:34 +02:00
release/java/info/nightscout/androidaps/annotations	Rx module	2022-11-06 12:28:35 +01:00
test/java/info/nightscout	migrate to junit5	2022-11-29 15:03:25 +01:00