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
..
libs	Revert "remove unused libs"	2021-05-23 11:13:39 +02:00
src	Merge branch 'dev' into FixSensScale	2021-05-26 21:50:58 +02:00
build.gradle	Revert "remove unused libs"	2021-05-23 11:13:39 +02:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
google-services.json	Survey	2019-10-08 21:20:04 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00