Merge branch 'develop' into feature/highlighter
This commit is contained in:
commit
e85d1c58e0
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
|||
/output_*/
|
||||
/source/components/
|
||||
/.sculpin/
|
||||
/vendor/
|
||||
|
|
8
composer.json
Normal file
8
composer.json
Normal file
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"require": {
|
||||
"sculpin/sculpin": "2.*@dev",
|
||||
"dflydev/embedded-composer-console": "@dev",
|
||||
"dflydev/embedded-composer-core": "@dev",
|
||||
"composer/composer": "@dev"
|
||||
}
|
||||
}
|
2400
composer.lock
generated
Normal file
2400
composer.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue