Merge remote-tracking branch 'upstream/2.1' into 2.1

# Conflicts: # composer.json
ezecosystem · May 23, 2018 · b23bd1d · b23bd1d
2 parents 36993d5 + 7290a0a
commit b23bd1d
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -39,26 +39,26 @@
         "doctrine/orm": "^2.5",
         "sensio/distribution-bundle": "^5.0.19",
         "incenteev/composer-parameter-handler": "~2.1",
-        "ezsystems/ezpublish-kernel": "^7.1@dev",
-        "ezsystems/repository-forms": "^2.1@dev",
-        "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
-        "ezsystems/ez-support-tools": "^0.2@dev",
-        "ezsystems/ezplatform-http-cache": "~0.6@dev",
-        "ezsystems/ezplatform-admin-ui": "^1.1@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev",
-        "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev",
-        "ezsystems/ezplatform-design-engine": "^1.2@dev",
-        "ezsystems/platform-ui-bundle": "^2.1@dev",
-        "ezsystems/studio-ui-bundle": "^2.1@dev",
-        "ezsystems/ezstudio-form-builder": "^2.1@dev",
-        "ezsystems/ezstudio-notifications": "^2.1@dev",
-        "ezsystems/date-based-publisher": "^2.1@dev",
-        "ezsystems/landing-page-fieldtype-bundle": "^2.1@dev",
-        "ezsystems/flex-workflow": "^2.1@dev",
-        "ezsystems/ezstudio-cron": "^1.0@dev",
-        "ezsystems/ezstudio-installer": "^2.1@dev",
+        "ezsystems/ezpublish-kernel": "~7.1.0@dev",
+        "ezsystems/repository-forms": "~2.1.0@dev",
+        "ezsystems/ezplatform-solr-search-engine": "~1.5.0@dev",
+        "ezsystems/ez-support-tools": "~0.2.1@dev",
+        "ezsystems/ezplatform-http-cache": "~0.6.0@dev",
+        "ezsystems/ezplatform-admin-ui": "~1.1.0@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "~1.1.0@dev",
+        "ezsystems/ezplatform-admin-ui-assets": "~2.0.0@dev",
+        "ezsystems/ezplatform-design-engine": "~1.2.0@dev",
+        "ezsystems/platform-ui-bundle": "~2.1.0@dev",
+        "ezsystems/studio-ui-bundle": "~2.1.0@dev",
+        "ezsystems/ezstudio-form-builder": "~2.1.0@dev",
+        "ezsystems/ezstudio-notifications": "~2.1.0@dev",
+        "ezsystems/date-based-publisher": "~2.1.0@dev",
+        "ezsystems/landing-page-fieldtype-bundle": "~2.1.0@dev",
+        "ezsystems/flex-workflow": "~2.1.0@dev",
+        "ezsystems/ezstudio-cron": "~1.0.0@dev",
+        "ezsystems/ezstudio-installer": "~2.1.0@dev",
         "ezsystems/platform-ui-assets-bundle": "^5.0.0",
-        "ezsystems/ezplatform-http-cache-fastly": "^1.1@dev",
+        "ezsystems/ezplatform-http-cache-fastly": "~1.1.0@dev",
         "knplabs/knp-menu-bundle": "^2.1",
         "willdurand/js-translation-bundle": "^2.6.4",
         "friendsofsymfony/jsrouting-bundle": "^1.4",