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	core -> core-main	2022-11-09 13:30:48 +01:00
allopen_dependencies.gradle	core -> core-main	2022-11-09 13:30:48 +01:00
android_dependencies.gradle	core -> core-main	2022-11-09 13:30:48 +01:00
android_module_dependencies.gradle	optimize build	2022-11-11 19:27:47 +01:00
build.gradle	fix build	2022-11-12 09:07:37 +01:00
consumer-rules.pro	core -> core-main	2022-11-09 13:30:48 +01:00
jacoco_global.gradle	core -> core-main	2022-11-09 13:30:48 +01:00
proguard-rules.pro	core -> core-main	2022-11-09 13:30:48 +01:00
test_dependencies.gradle	core -> core-main	2022-11-09 13:30:48 +01:00