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
..
libs	remove crashing library	2021-02-13 19:19:14 +01:00
src	Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft	2021-03-01 08:34:40 +01:00
build.gradle	use DateTime instead of Calendar	2021-02-24 09:49:02 +01:00
fabric.properties
google-services.json	Survey	2019-10-08 21:20:04 +02:00
proguard-rules.pro