Philoul 6c8b4dfab0 Merge branch 'meallink' into meallink_ValueWithUnit ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt		2021-03-29 22:39:12 +02:00
..
java/info/nightscout/androidaps/plugins/pump/omnipod/eros	Merge branch 'meallink' into meallink_ValueWithUnit	2021-03-29 22:39:12 +02:00
res	New Crowdin updates (#388)	2021-03-08 20:22:45 +01:00
AndroidManifest.xml	More work in progress on moving stuff from omnipod-eros to omnipod-common	2021-02-21 22:01:59 +01:00