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
..
libs	Revert "remove unused libs"	2021-05-23 11:13:39 +02:00
src	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TWD_TestMerge	2022-06-30 20:27:54 +02:00
build.gradle	Merge remote-tracking branch 'Nightscout/dev' into Autotune/AddtitionalUnitTests	2022-06-30 01:03:30 +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