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