Merge remote-tracking branch 'origin/master' into sponsorship
This commit is contained in:
commit
f3a6960919
|
@ -10,8 +10,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"dflydev/embedded-composer": "^1.0@dev",
|
"sculpin/sculpin": "^3"
|
||||||
"sculpin/sculpin": "^2.1@dev"
|
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "composer run-script generate",
|
"dev": "composer run-script generate",
|
||||||
|
|
1527
composer.lock
generated
1527
composer.lock
generated
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue