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
..
src	Merge remote-tracking branch 'origin/dev' into feature/new-sms-command	2022-12-04 21:49:17 +01:00
build.gradle	Non transitive R classes	2022-12-02 10:56:11 +01:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
google-services.json	AndroidAPS - AAPS, NSClient -> AAPSClient	2022-10-13 15:26:49 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00