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
..
activities	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
db	MainApp -> kt, the rest of DatabaseHelperInterface	2021-03-04 19:23:01 +01:00
dependencyInjection	automation module	2021-02-22 17:22:30 +01:00
dialogs	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
events	automation module	2021-02-22 17:22:30 +01:00
historyBrowser	fix tests	2021-03-01 17:22:12 +01:00
plugins	Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev	2021-03-04 23:19:08 +01:00
queue	use fun instead of val in pump interface	2021-02-17 19:28:43 +01:00
receivers	use fun instead of val in pump interface	2021-02-17 19:28:43 +01:00
services	Intents -> kt	2021-02-25 17:55:42 +01:00
setupwizard	add Window Permssion into Setup Wizard	2021-03-04 04:39:35 +13:00
skins	OverviewFragment -> jetpack	2021-02-04 12:03:34 +01:00
utils	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU	2021-03-03 22:49:31 +01:00
Config.kt	asking for permissions refactor	2021-01-18 22:47:55 +01:00
MainActivity.kt	Privacy option in StartupWizard	2021-02-21 12:30:45 +01:00
MainApp.kt	MainApp -> kt, the rest of DatabaseHelperInterface	2021-03-04 19:23:01 +01:00