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	Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit	2021-03-30 23:05:19 +02:00
.gitignore	core module	2020-05-03 21:27:42 +02:00
build.gradle	migrate rest of gradle module files	2021-02-18 23:35:23 +01:00
consumer-rules.pro	core module	2020-05-03 21:27:42 +02:00
core_dependencies.gradle	Merge remote-tracking branch 'upstream/dev' into dash	2021-02-20 18:48:06 +01:00
proguard-rules.pro	core module	2020-05-03 21:27:42 +02:00