TebbeUbben f7597c93d7 Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java		2018-06-08 23:30:39 +02:00
..
nightscout	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev	2018-06-08 23:30:39 +02:00