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
..
aps	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-11-29 23:34:11 +01:00
automation	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean	2022-11-29 23:34:11 +01:00
configuration	New Crowdin updates (#2232)	2022-11-28 22:34:12 +01:00
main	New Crowdin updates (#2232)	2022-11-28 22:34:12 +01:00
openhumans	New Crowdin updates (#2232)	2022-11-28 22:34:12 +01:00
sensitivity	New Crowdin updates (#2232)	2022-11-28 22:34:12 +01:00
support	ActivityNames -> UiInteraction	2022-11-28 21:12:41 +01:00
sync	New Crowdin updates (#2232)	2022-11-28 22:34:12 +01:00