From 78720ef94cfae90afebd9f5b63d201af5a01d23e Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 13 Jul 2016 14:33:58 -0400
Subject: 1.1.96

Former-commit-id: addb03ddf14e600a5cc56c046e23103785100072
---
 CHANGELOG.md | 19 +++++++++++++++++++
 config.xml   |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26c13693..1cca3468 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Change Log
 
+## [v1.1.96](https://github.com/pliablepixels/zmNinja/tree/v1.1.96) (2016-07-13)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.1.94...v1.1.96)
+
+**Implemented enhancements:**
+
+- Make sure zmNinja plays ball with new user roles in APIs [\#93](https://github.com/pliablepixels/zmNinja/issues/93)
+
+**Fixed bugs:**
+
+- Slash screen PIN entry text error on zmN 1.1.94b [\#284](https://github.com/pliablepixels/zmNinja/issues/284)
+- build for android broke - uglify is messing up release builds [\#282](https://github.com/pliablepixels/zmNinja/issues/282)
+- ZMNinja back button issue [\#281](https://github.com/pliablepixels/zmNinja/issues/281)
+- Modify montage filtering to make sure maxLimit does not include disabled monitors [\#277](https://github.com/pliablepixels/zmNinja/issues/277)
+- Some Android phones seem to have SSL issues with self-signed certs [\#273](https://github.com/pliablepixels/zmNinja/issues/273)
+
+**Closed issues:**
+
+- Multi-server not video from cameras [\#283](https://github.com/pliablepixels/zmNinja/issues/283)
+
 ## [v1.1.94](https://github.com/pliablepixels/zmNinja/tree/v1.1.94) (2016-07-09)
 [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.1.93...v1.1.94)
 
diff --git a/config.xml b/config.xml
index 6711a854..f685763f 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.1.95" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.1.96" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
-- 
cgit v1.2.3