Merge remote-tracking branch 'upstream/master'

composer.json

@@ -28,17 +28,17 @@
         "doctrine/doctrine-bundle": "^1.9.1",
         "doctrine/orm": "^2.6.3",
         "ezsystems/ez-support-tools": "^0.2@dev",
-        "ezsystems/ezplatform-admin-ui": "^1.4@dev",
+        "ezsystems/ezplatform-admin-ui": "^1.5@dev",
         "ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "^1.4@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.5@dev",
         "ezsystems/ezplatform-cron": "^2.0@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
         "ezsystems/ezplatform-http-cache": "~0.8@dev",
-        "ezsystems/ezplatform-richtext": "^1.0@dev",
+        "ezsystems/ezplatform-richtext": "^1.1@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5.4@dev",
         "ezsystems/ezplatform-standard-design": "^0.1@dev",
-        "ezsystems/ezpublish-kernel": "^7.4@dev",
-        "ezsystems/repository-forms": "^2.4@dev",
+        "ezsystems/ezpublish-kernel": "^7.5@dev",
+        "ezsystems/repository-forms": "^2.5@dev",
         "friendsofsymfony/jsrouting-bundle": "^1.6.3",
         "incenteev/composer-parameter-handler": "^2.1.3",
         "knplabs/knp-menu-bundle": "^2.2.1",
@@ -70,7 +70,8 @@
     },
     "conflict": {
         "symfony/symfony": "3.4.9||3.4.12||3.4.16",
-        "doctrine/dbal": "2.7.0"
+        "doctrine/dbal": "2.7.0",
+        "twig/twig": "2.6.1"
     },
     "scripts": {
         "symfony-scripts": [
@@ -114,7 +115,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.4.x-dev"
+            "dev-master": "2.5.x-dev"
         }
     }
 }