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
..
com	Cleanup.	2017-10-26 17:35:46 +02:00
info/nightscout	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev	2018-06-08 23:30:39 +02:00
org/monkey/d/ruffy/ruffy/driver/display	Source code from ruffyscripter, ruffy-spi modules.	2018-01-28 22:03:32 +01:00