mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Merge branch 'master' into greenkeeper-grunt-spritesmith-6.1.1
This commit is contained in:
commit
4394e29db0
@ -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",
|
||||||
@ -33,11 +33,11 @@
|
|||||||
"grunt-replace": "0.11.0",
|
"grunt-replace": "0.11.0",
|
||||||
"grunt-spritesmith": "6.1.1",
|
"grunt-spritesmith": "6.1.1",
|
||||||
"jasmine-core": "2.1.0",
|
"jasmine-core": "2.1.0",
|
||||||
"karma": "0.13.16",
|
"karma": "0.13.19",
|
||||||
"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.3",
|
||||||
"load-grunt-tasks": "3.1.0",
|
"load-grunt-tasks": "3.4.0",
|
||||||
"phantomjs": "1.9.19"
|
"phantomjs": "1.9.19"
|
||||||
},
|
},
|
||||||
"window": {
|
"window": {
|
||||||
|
Loading…
Reference in New Issue
Block a user