Merge branch '2.1'
Conflicts: .travis.yml
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,4 +1,5 @@
|
||||
composer.phar
|
||||
composer.lock
|
||||
vendor/
|
||||
build/
|
||||
build/
|
||||
task
|
Reference in New Issue
Block a user