Commit 37acc2f1 authored by Alf Eaton's avatar Alf Eaton
Browse files

Merge remote-tracking branch 'origin/master' into reducer-import-export

parents d2040f73 b7da0f04
......@@ -5,7 +5,9 @@
"extends": ["standard", "standard-react"],
"env": {
"browser": true,
"es6": true
"es6": true,
"jest": true,
"jasmine": true
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment