Philoul 3ffe966ebf Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean ... # Conflicts: # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt		2022-11-29 23:34:11 +01:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-11-29 23:34:11 +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	maintenance -> :core:configuration	2022-11-27 22:19:40 +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