Merge 85669c6 into 9c18504

mesosphere · Dec 14, 2016 · 26111b9 · 26111b9
2 parents 9c18504 + 85669c6
commit 26111b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unversioned
+## 1.1.6 - 2016-12-14
 ### Fixed
 - \#4569: npm run serve error
 - \#4679: Updating "user" in configuration in web gui has no effect

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marathon-ui",
-  "version": "1.2.0",
+  "version": "1.1.6",
   "engines": {
     "node": "5.4.1"
   },