Philoul 4112b909f1 Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt # app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt # automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionRunAutotune.kt # core/src/main/java/info/nightscout/androidaps/interfaces/Autotune.kt		2022-07-17 17:22:25 +02:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-07-17 17:22:25 +02:00
.gitignore	automation module	2021-02-22 17:22:30 +01:00
build.gradle	gradle update	2022-06-06 10:25:08 +02: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