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
..
main	Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit	2021-03-30 23:05:19 +02:00
test/java/info/nightscout/androidaps	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00