Philoul bf218e9ff4 Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt		2021-03-30 23:05:19 +02:00
..
src/main	Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit	2021-03-30 23:05:19 +02:00
.gitignore	insight -> lib	2021-02-21 18:03:26 +01:00
build.gradle	PumpSync interface, VirtualPump, remove pump driver dependency to database	2021-03-29 00:31:40 +02:00
consumer-rules.pro	insight -> lib	2021-02-21 18:03:26 +01:00
proguard-rules.pro	insight -> lib	2021-02-21 18:03:26 +01:00