Philoul 506fbde587 Merge branch 'dev' into FixSensScale ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt		2021-05-26 21:50:58 +02:00
..
info/nightscout/androidaps	Merge branch 'dev' into FixSensScale	2021-05-26 21:50:58 +02:00