Merge branch 'master' into ignore-multisite-dist

This commit is contained in:
Daniel Bachhuber 2016-12-21 05:19:40 -08:00
commit ab0f554bef

View file

@ -26,7 +26,7 @@
"symfony/process": "~2.1",
"symfony/translation": "~2.7",
"nb/oxymel": "~0.1.0",
"composer/composer": "^1.0.0"
"composer/composer": "^1.2.0"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",