Philoul 2ae4cc3c03 Merge remote-tracking branch 'Nightscout/dev' into New/AddCorrPercentInWizard ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt		2021-12-11 02:33:41 +01:00
..
libs	Revert "remove unused libs"	2021-05-23 11:13:39 +02:00
src	Merge remote-tracking branch 'Nightscout/dev' into New/AddCorrPercentInWizard	2021-12-11 02:33:41 +01:00
build.gradle	share code between aap and wear	2021-12-10 08:58:23 +01: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