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	consolidate plugin modules	2022-11-14 23:21:03 +01:00
build.gradle	modules cleanup	2022-11-25 22:14:46 +01:00
consumer-rules.pro	consolidate plugin modules	2022-11-14 23:21:03 +01:00
proguard-rules.pro	consolidate plugin modules	2022-11-14 23:21:03 +01:00