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 |
|