summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-09-02 16:36:46 -0400
committerPliable Pixels <pliablepixels@gmail.com>2016-09-02 16:36:46 -0400
commit88c841cdc8669c498b3fee5e04c30750ffe72881 (patch)
tree0a1d44cb269c0adff56b57386b7e6d5a56d41f9d /CHANGELOG.md
parent5215843e9ed4423f3da0d46be4bf086763592218 (diff)
bump
Former-commit-id: 3a26cdab244416ae35e31515b097af510db2164f
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md10
1 files changed, 2 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2d80fda..32524d8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
# Change Log
## [v1.2.17](https://github.com/pliablepixels/zmNinja/tree/v1.2.17) (2016-09-01)
-[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.13...v1.2.17)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.0...v1.2.17)
**Implemented enhancements:**
@@ -21,6 +21,7 @@
**Closed issues:**
+- modal close via back action on Android - make sure all timers re-start/resources released [\#305](https://github.com/pliablepixels/zmNinja/issues/305)
- ZMninja API issue with zoneminder 1.30 [\#300](https://github.com/pliablepixels/zmNinja/issues/300)
**Merged pull requests:**
@@ -31,13 +32,6 @@
- tweaks to Sleep/Wake/Reset \#306 [\#308](https://github.com/pliablepixels/zmNinja/pull/308) ([pliablepixels](https://github.com/pliablepixels))
- Added Wake-Sleep-Reset control commands [\#307](https://github.com/pliablepixels/zmNinja/pull/307) ([sctt](https://github.com/sctt))
-## [v1.2.13](https://github.com/pliablepixels/zmNinja/tree/v1.2.13) (2016-08-18)
-[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.0...v1.2.13)
-
-**Closed issues:**
-
-- modal close via back action on Android - make sure all timers re-start/resources released [\#305](https://github.com/pliablepixels/zmNinja/issues/305)
-
## [v1.2.0](https://github.com/pliablepixels/zmNinja/tree/v1.2.0) (2016-08-10)
[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/vv1.2.0...v1.2.0)