Merge pull request #245 from flightjs/v_1_1_4

flight 1.1.4
flightjs · Apr 19, 2014 · 6b7b9cb · 6b7b9cb
2 parents d96e906 + 018bfd2
commit 6b7b9cb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## v1.1.4 (4/18/2014)
+
+###features
+* Existing Components can now be extended with `mixin`
+https://github.com/flightjs/flight/pull/238
+https://github.com/flightjs/flight/pull/242
+
+* Nested event logging
+https://github.com/flightjs/flight/pull/244
+
+###bug fixes and tweaks
+
+* No fatal CSP error for accessing storage when cookies are off
+https://github.com/flightjs/flight/pull/233
+
 ## v1.1.3 (2/18/2014)
 
 ###features

diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "flight",
   "description": "Clientside component infrastructure",
   "main": "lib/index.js",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "ignore": [
     "doc",
     "tools",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flight",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "devDependencies": {
     "karma": "<=0.11.14",
     "karma-jasmine": "~0.1.0",