aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorAlban Peignier2017-10-17 11:56:08 +0200
committerAlban Peignier2017-10-17 11:56:08 +0200
commit545671efd71380722dbc3272f5f513ea684891bd (patch)
treee8e1101bf2c8046d61d5185cce8d0b4245ad2183 /package.json
parentf480ad0739e5c0ec2c0c8bb890344b9c4777ba35 (diff)
parent58cfec64c621d1c6893280f5ad8793af81573199 (diff)
downloadchouette-core-545671efd71380722dbc3272f5f513ea684891bd.tar.bz2
Merge branch 'master' into staging
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 010f2b606..7e8d695ac 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"<rootDir>/spec/javascript"
],
"setupFiles": [
- "<rootDir>/config/webpack/test.js"
+ "<rootDir>/spec/javascript/spec_helper.js"
]
}
}