aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorRobert2017-04-24 14:16:52 +0200
committerRobert2017-04-24 14:16:52 +0200
commit2d19e65fa8d8ac037c7f00a638111788b7ee002c (patch)
tree830fe41ac13743f75f2c16f41dfd1ff399b99a9b /package.json
parent5003acfc533baa824fed11cf6f82f86393b3a0f6 (diff)
parent1cbed80c913420c76ac7d3716b9d8c4bf4e14278 (diff)
downloadchouette-core-2d19e65fa8d8ac037c7f00a638111788b7ee002c.tar.bz2
conflict resolution and asset recompilation
Diffstat (limited to 'package.json')
-rw-r--r--package.json10
1 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json
index 4e975de5c..9a46403f3 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,10 @@
"react-redux": "4.4.5",
"react-select2": "4.0.2",
"redux": "3.6.0",
- "whatwg-fetch": "2.0.3"
+ "whatwg-fetch": "2.0.3",
+ "redux-logger": "2.7.4",
+ "redux-thunk": "2.1.0",
+ "redux-promise": "0.5.3"
},
"license": "MIT",
"engines": {
@@ -23,9 +26,6 @@
"devDependencies": {
"es6-object-assign": "1.0.3",
"react-addons-test-utils": "15.3.2",
- "sinon": "1.17.7",
- "redux-logger": "2.7.4",
- "redux-thunk": "2.1.0",
- "redux-promise": "0.5.3"
+ "sinon": "1.17.7"
}
}