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
..
aps	Merge remote-tracking branch 'origin/dev' into feature/new-sms-command	2022-12-04 21:49:17 +01:00
automation	Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev	2022-12-02 14:29:38 +01:00
configuration	Log Worker results	2022-12-04 17:49:03 +01:00
main	Merge remote-tracking branch 'origin/dev' into feature/new-sms-command	2022-12-04 21:49:17 +01:00
openhumans	Non transitive R classes	2022-12-02 10:56:11 +01:00
sensitivity	New Crowdin updates (#2248)	2022-12-02 14:29:28 +01:00
support	New Crowdin updates (#2248)	2022-12-02 14:29:28 +01:00
sync	Log Worker results	2022-12-04 17:49:03 +01:00