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
..
libs	TBR emulation	2018-06-02 16:37:53 +02:00
src	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev	2018-06-08 23:30:39 +02:00
build.gradle	Merge branch 'dev' into startupwizard	2018-05-20 14:18:58 +02:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00