Philoul 35461bfdd8 Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean_TestMerge ... # Conflicts: # automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt # plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt # plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt # plugins/src/main/res/layout/autotune_fragment.xml		2022-11-14 09:09:21 +01:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean_TestMerge	2022-11-14 09:09:21 +01:00
.gitignore	automation module	2021-02-22 17:22:30 +01:00
build.gradle	:database:entities	2022-11-09 23:28:48 +01:00
consumer-rules.pro	automation module	2021-02-22 17:22:30 +01:00
proguard-rules.pro	automation module	2021-02-22 17:22:30 +01:00