Philoul 40e6ebc44a Merge remote-tracking branch 'Nightscout/dev' into Autotune/TWD_TestMerge ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt		2022-06-30 20:27:54 +02:00
..
main	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TWD_TestMerge	2022-06-30 20:27:54 +02:00
test/java/info/nightscout/androidaps	DateUtil lints	2022-04-24 10:08:25 +02:00