Merge branch 'develop' into feature/highlighter

This commit is contained in:
Oliver Davies 2015-08-08 18:14:56 +01:00
commit e85d1c58e0
3 changed files with 2409 additions and 0 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/output_*/
/source/components/
/.sculpin/
/vendor/

8
composer.json Normal file
View 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

File diff suppressed because it is too large Load diff