From 6a0849f3639690cd130429cf54eca38c620c4e6b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 18 Oct 2019 08:48:02 +0200
Subject: v3.2.0 (no change)

---
 composer.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'composer.json')

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": {
-- 
cgit