1
0
Fork 0
AndroidAPS/plugins/aps/src/main
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
..
assets aps module 2022-11-14 23:14:37 +01:00
java/info/nightscout/plugins Merge remote-tracking branch 'origin/dev' into feature/new-sms-command 2022-12-04 21:49:17 +01:00
res New Crowdin updates () 2022-12-02 14:29:28 +01:00
AndroidManifest.xml rename module 2022-11-14 19:04:09 +01:00