From 917a14938fa2ea7fb4d58df43360bfba08a8e7d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 3 Nov 2020 11:15:36 +0100 Subject: [PATCH] Revert "[Composer] Set metarepo branch for tests and requirements for master branch" This reverts commit 2a57e16bc20f3e6847673419c9e8370b37bbea86. --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5d4c51a351..4439039866 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "symfony/asset": "^5.0", "symfony/yaml": "^5.0", "jms/translation-bundle": "^1.5", - "ezsystems/ezplatform-kernel": "^1.3@dev", + "ezsystems/ezplatform-kernel": "~1.2.0@dev", "ezsystems/ezplatform-content-forms": "^1.0@dev", "ezsystems/ezplatform-design-engine": "^3.0@dev", "ezsystems/ezplatform-user": "^2.0@dev", @@ -58,10 +58,10 @@ "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating" }, "extra": { - "_ezplatform_branch_for_behat_tests": "master", + "_ezplatform_branch_for_behat_tests": "3.2", "branch-alias": { - "dev-tmp_ci_branch": "2.3.x-dev", - "dev-master": "2.3.x-dev" + "dev-tmp_ci_branch": "2.2.x-dev", + "dev-master": "2.2.x-dev" } } }