Philoul 66ca375bc6 Merge branch 'dev' into Autotune/TuneWeekDaysClean ... # Conflicts: # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt # plugins/aps/src/main/res/layout/autotune_fragment.xml		2022-11-16 23:19:25 +01:00
..
src	Merge branch 'dev' into Autotune/TuneWeekDaysClean	2022-11-16 23:19:25 +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	NumberPicker -> :core:ui	2022-11-14 13:53:25 +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