piotrek 54f6e7929f Merge remote-tracking branch 'origin/dev' into feature/new-sms-command ... # Conflicts: # app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt # app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt # app/src/test/java/info/nightscout/androidaps/plugins/safety/SafetyPluginTest.kt # plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt # plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt # plugins/main/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt # ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt		2022-12-04 21:49:17 +01:00
..
main	Merge remote-tracking branch 'origin/dev' into feature/new-sms-command	2022-12-04 21:49:17 +01:00
test/java/info/nightscout	migrate to junit5	2022-11-29 15:03:25 +01:00