Merge branch '1.0.0_WIP'

reduxjs · Sep 9, 2015 · 7e183b8 · 7e183b8
2 parents 165f461 + 919e760
commit 7e183b8
Show file tree

Hide file tree

Showing 7 changed files with 936 additions and 172 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,12 @@
+{
+  "extends": "eslint-config-airbnb",
+  "env": {
+    "browser": true,
+    "mocha": true,
+    "node": true
+  },
+  "rules": {
+    "block-scoped-var": 0,
+    "indent": [2, 4]
+  }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.0.0-alpha]() - 2015/08/31
+
+### Breaking Changes
+
+### New
+
diff --git a/CREDITS.md b/CREDITS.md
@@ -8,6 +8,7 @@
   at the React Europe Hackathon 2015. Also added tests.
 
 * Contributors: Lee Bannard, Martijn Faassen, Robert Binna, Alex
-  Guerra, ryanatkn, Adam Royle, Christian Schuhmann, Jason Huang
+  Guerra, ryanatkn, Adam Royle, Christian Schuhmann, Jason Huang,
+  Daniel Barreto
 
 * Inspired by getters in Nuclear.js and subscriptions in re-frame.