dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add tracking for resolved conflicts"
[lhc/web/wiklou.git]
/
package.json
diff --git
a/package.json
b/package.json
index
762c5e7
..
66c13cd
100644
(file)
--- a/
package.json
+++ b/
package.json
@@
-9,7
+9,7
@@
"devDependencies": {
"deepmerge": "1.3.2",
"eslint": "3.12.2",
"devDependencies": {
"deepmerge": "1.3.2",
"eslint": "3.12.2",
- "eslint-config-wikimedia": "0.
3
.0",
+ "eslint-config-wikimedia": "0.
4
.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.6.0",
"grunt-contrib-copy": "1.0.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.6.0",
"grunt-contrib-copy": "1.0.0",
@@
-19,15
+19,16
@@
"grunt-karma": "2.0.0",
"grunt-stylelint": "0.7.0",
"grunt-webdriver": "2.0.3",
"grunt-karma": "2.0.0",
"grunt-stylelint": "0.7.0",
"grunt-webdriver": "2.0.3",
- "karma": "1.
1
.0",
+ "karma": "1.
5
.0",
"karma-chrome-launcher": "2.0.0",
"karma-chrome-launcher": "2.0.0",
- "karma-firefox-launcher": "1.0.
0
",
+ "karma-firefox-launcher": "1.0.
1
",
"karma-mocha-reporter": "2.2.3",
"karma-qunit": "1.0.0",
"karma-mocha-reporter": "2.2.3",
"karma-qunit": "1.0.0",
- "qunitjs": "1.2
2.0
",
+ "qunitjs": "1.2
3.1
",
"stylelint-config-wikimedia": "0.4.1",
"wdio-junit-reporter": "0.2.0",
"wdio-mocha-framework": "0.5.8",
"stylelint-config-wikimedia": "0.4.1",
"wdio-junit-reporter": "0.2.0",
"wdio-mocha-framework": "0.5.8",
+ "wdio-sauce-service": "^0.3.1",
"wdio-spec-reporter": "0.0.5",
"webdriverio": "4.6.2"
}
"wdio-spec-reporter": "0.0.5",
"webdriverio": "4.6.2"
}