TebbeUbben d1f7086651 Merge branch 'master' into insight-dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java		2019-01-31 13:08:33 +01:00
..
libs	TBR emulation	2018-06-02 16:37:53 +02:00
src	Merge branch 'master' into insight-dev	2019-01-31 13:08:33 +01:00
build.gradle	Change build version	2019-01-19 13:52:23 +01: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