Merge branch '2.1'

Conflicts:
	.travis.yml
This commit is contained in:
DavidBadura 2015-12-26 10:57:39 +00:00
commit 3aaa6492dd
1 changed files with 2 additions and 1 deletions

3
.gitignore vendored
View File

@ -1,4 +1,5 @@
composer.phar
composer.lock
vendor/
build/
build/
task