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
..
graph	New Crowdin updates (#2248)	2022-12-02 14:29:28 +01:00
graphview	Non transitive R classes	2022-12-02 10:56:11 +01:00
interfaces	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-12-06 23:56:07 +01:00
libraries	modules cleanup	2022-11-25 22:14:46 +01:00
main	Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev	2022-12-04 11:36:48 +01:00
ns-sdk	Non transitive R classes	2022-12-02 10:56:11 +01:00
ui	New Crowdin updates (#2249)	2022-12-06 12:53:06 +01:00
utils	Log Worker results	2022-12-04 17:49:03 +01:00
validators	New Crowdin updates (#2248)	2022-12-02 14:29:28 +01:00