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
..
aps	better message for out of limit	2021-03-03 00:07:02 +01:00
configBuilder	Update uel.log entries, Increase database version 3=>4, update migration3to4	2021-02-28 15:54:37 +01:00
constraints	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
general	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-04 23:19:08 +01:00
insulin	ActivityGraph -> kt	2021-02-15 22:38:41 +01:00
iob/iobCobCalculator	small fixes	2021-03-01 23:37:14 +01:00
profile	uel log, put name in value with unit	2021-03-03 08:53:48 +01:00
pump	TemporaryTarget -> room database	2021-03-01 12:42:42 +01:00
sensitivity	MainApp -> kt, the rest of DatabaseHelperInterface	2021-03-04 19:23:01 +01:00
source	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-04 23:19:08 +01:00
treatments	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-04 23:19:08 +01:00