mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into greenkeeper-karma-0.13.18

Browse Source 
Conflicts:
	package.json
This commit is contained in:
jdescottes 2016-01-13 23:04:51 +01:00
commit 97690ce486
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -25,7 +25,7 @@
"grunt-contrib-watch": "0.6.1", "grunt-contrib-watch": "0.6.1",
"grunt-ghost": "1.1.0", "grunt-ghost": "1.1.0",
"grunt-include-replace": "3.2.0", "grunt-include-replace": "3.2.0",
"grunt-jscs": "2.5.0", "grunt-jscs": "2.6.0",
"grunt-karma": "0.12.1", "grunt-karma": "0.12.1",
"grunt-leading-indent": "0.2.0", "grunt-leading-indent": "0.2.0",
"grunt-nw-builder": "2.0.0", "grunt-nw-builder": "2.0.0",
@ -37,7 +37,7 @@
"karma-chrome-launcher": "0.2.2", "karma-chrome-launcher": "0.2.2",
"karma-jasmine": "0.3.5", "karma-jasmine": "0.3.5",
"karma-phantomjs-launcher": "0.2.2", "karma-phantomjs-launcher": "0.2.2",
"load-grunt-tasks": "3.1.0", "load-grunt-tasks": "3.4.0",
"phantomjs": "1.9.19" "phantomjs": "1.9.19"
}, },
"window": { "window": {