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
..
arrays.xml	Merge pull request #331 from andyrozman/irish_lang	2021-02-25 10:27:54 +01:00
colors.xml	UserEntry text format and colors.xml	2021-03-04 14:52:30 +01:00
dimens.xml	remove mdtp library	2020-05-10 21:07:58 +02:00
exam.xml	Update exam.xml	2021-01-30 12:30:43 +00:00
objectives.xml	refactor import/export to create DaggerAppCompatActivityWithResult	2021-01-18 17:36:18 +01:00
strings.xml	Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit	2021-03-30 23:05:19 +02:00
styles.xml	insight -> lib	2021-02-21 18:03:26 +01:00