diff options
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 485667b..9d99e7b 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,9 @@ "Zend\\Json\\Server\\": "src/" } }, + "conflict": { + "zendframework/zend-stdlib": "<3.2.1" + }, "autoload-dev": { "files": [ "test/TestAsset/FooFunc.php" @@ -45,8 +48,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1.x-dev", - "dev-develop": "3.2.x-dev" + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" } }, "scripts": { |