Philoul c065672179 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt		2021-03-04 23:19:08 +01:00
..
actions	Merge Dev, Fix new uel.log in NSClientPlugin	2021-03-03 23:53:15 +01:00
dataBroadcaster	automation module	2021-02-22 17:22:30 +01:00
food	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft	2021-03-01 08:34:40 +01:00
maintenance	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
nsclient	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-04 23:19:08 +01:00
openhumans	MainApp -> kt, the rest of DatabaseHelperInterface	2021-03-04 19:23:01 +01:00
overview	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-04 23:19:08 +01:00
persistentNotification	automation module	2021-02-22 17:22:30 +01:00
smsCommunicator	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
tidepool	MainApp -> kt, the rest of DatabaseHelperInterface	2021-03-04 19:23:01 +01:00
wear	MainApp -> kt, the rest of DatabaseHelperInterface	2021-03-04 19:23:01 +01:00
xdripStatusline	automation module	2021-02-22 17:22:30 +01:00