projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #12306 from JO0st/dev-core-166
[civicrm-core.git]
/
package.json
diff --git
a/package.json
b/package.json
index d8a60755a359ae7ac37e69897f71db42975405b8..70919c710caf1cbb7e97b5f68c84822c08034890 100644
(file)
--- a/
package.json
+++ b/
package.json
@@
-11,11
+11,11
@@
"devDependencies": {
"bower": "^1.3.1",
"civicrm-cv": "^0.1.2",
"devDependencies": {
"bower": "^1.3.1",
"civicrm-cv": "^0.1.2",
- "karma": "^
0.12.16
",
- "karma-ng-html2js-preprocessor": "^
0.1.2
",
+ "karma": "^
2.0.2
",
+ "karma-ng-html2js-preprocessor": "^
1.0.0
",
"karma-phantomjs-launcher": "^1.0.4",
"karma-phantomjs-launcher": "^1.0.4",
- "jasmine-core": "~
2.1.2
",
- "karma-jasmine": "~
0.3
.2"
+ "jasmine-core": "~
3.1.0
",
+ "karma-jasmine": "~
1.1
.2"
},
"scripts": {
"postinstall": "bash tools/scripts/npm/postinstall.sh",
},
"scripts": {
"postinstall": "bash tools/scripts/npm/postinstall.sh",