Merge remote-tracking branch 'upstream/master' into storeMixins

Author: STRML

.travis.yml

@@ -1,6 +1,10 @@
+sudo: false
 language: node_js
 node_js:
   - 0.10
+  - 0.12
+  - iojs-v1.8.4
+  - iojs-v2.5.0
 notifications:
   webhooks:
     urls:

CHANGELOG.md

@@ -1,3 +1,28 @@
+Version 1.7.1
+=============
+
+* Relax restrictions on Lodash version (#128)
+
+Version 1.7.0
+=============
+
+* Add `Flux#getAllStores()` to retrieve all currently registered stores (#127)
+
+Version 1.6.0
+=============
+
+* 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
+=============
+
+* Use built-in inherits instead of npm package (#116)
+
 Version 1.5.2
 =============
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxxor",
-  "version": "1.5.2",
+  "version": "1.7.1",
   "main": "build/fluxxor.min.js",
   "description": "Flux architecture tools for React",
   "homepage": "",