Merge branch 'bugs/lodash-node-3_9_0'

BinaryMuse · May 19, 2015 · ef9822b · ef9822b
2 parents b35d28b + b473528
commit ef9822b
Show file tree

Hide file tree

Showing 26 changed files with 1,920 additions and 1,523 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 * Add `Flux#setDispatchInterceptor` to wrap or replace dispatch functionality (#100, #92)
 
+Version 1.5.4
+=============
+
+* Fix incompatibility with Lodash 3.9.0
+
 Version 1.5.3
 =============
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "fluxxor",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "main": "build/fluxxor.min.js",
   "description": "Flux architecture tools for React",
   "homepage": "",