Philoul df995724a7 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft ... # Conflicts: # automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt		2021-03-01 08:34:40 +01:00
..
schemas/info.nightscout.androidaps.database.AppDatabase	Update uel.log entries, Increase database version 3=>4, update migration3to4	2021-02-28 15:54:37 +01:00
src/main	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft	2021-03-01 08:34:40 +01:00
.gitignore	database module	2021-02-04 18:22:58 +01:00
build.gradle	migrate rest of gradle module files	2021-02-18 23:35:23 +01:00
consumer-rules.pro	database module	2021-02-04 18:22:58 +01:00
proguard-rules.pro	database module	2021-02-04 18:22:58 +01:00