Philoul 5f8b337eaa Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean ... # Conflicts: # core/core-main/src/main/res/values/strings.xml # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt # plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt		2022-12-06 23:56:07 +01:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-12-06 23:56:07 +01:00
.gitignore	rename module	2022-11-14 19:04:09 +01:00
build.gradle	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-12-06 23:56:07 +01:00
consumer-rules.pro	rename module	2022-11-14 19:04:09 +01:00
proguard-rules.pro	rename module	2022-11-14 19:04:09 +01:00