Johannes Mockenhaupt 1a8c0fcf52 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cancel ongoing notification when plugin is disabled. Fix typo in fragment name. Nitpicky symmetry. PersistentNotification unregister workaround. Make PumpEnactResult fluent. Minor code cleanup. # Conflicts: # app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java # app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java		2017-11-22 22:17:57 +01:00
..
libs	first rhino	2017-10-15 02:52:57 +02:00
src	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-11-22 22:17:57 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Some ComboFragment cleanups.	2017-11-08 23:31:40 +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