Merge branch 'demo_2.2' into demo_master

.travis.yml

@@ -53,7 +53,6 @@ before_script:
 # Behat will use behat.yml which is a copy of behat.yml.dist with hostnames update by doc/docker/selenium.yml
 script: docker-compose exec --user www-data app sh -c "php $TEST_CMD"
 
-
 after_failure:
   # Will show us the last bit of the log of container's main processes
   # (not counting shell process above running php and behat)

bin/.travis/trusty/update_docker.sh

@@ -12,7 +12,7 @@ docker -v
 
 
 docker-compose -v
-DOCKER_COMPOSE_VERSION="1.19.0"
+DOCKER_COMPOSE_VERSION="1.23.1"
 echo "\nUpdating Docker Compose to ${DOCKER_COMPOSE_VERSION}"
 sudo rm -f /usr/local/bin/docker-compose
 curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose

composer.json

@@ -27,11 +27,11 @@
         "php": "^7.1",
         "doctrine/doctrine-bundle": "^1.9.1",
         "doctrine/orm": "^2.6.3",
-        "ezplatform-i18n/ezplatform-i18n-de_de": "^2.0",
-        "ezplatform-i18n/ezplatform-i18n-fr_fr": "^2.0",
-        "ezplatform-i18n/ezplatform-i18n-nb_no": "^2.0",
-        "ezplatform-i18n/ezplatform-i18n-pl_pl": "^2.0",
-        "ezplatform-i18n/ezplatform-i18n-ru_ru": "^2.0",
+        "ezplatform-i18n/ezplatform-i18n-de_de": "^2.3",
+        "ezplatform-i18n/ezplatform-i18n-fr_fr": "^2.3",
+        "ezplatform-i18n/ezplatform-i18n-nb_no": "^2.3",
+        "ezplatform-i18n/ezplatform-i18n-pl_pl": "^2.3",
+        "ezplatform-i18n/ezplatform-i18n-ru_ru": "^2.3",
         "ezsystems/ez-support-tools": "^0.2@dev",
         "ezsystems/ezplatform-admin-ui": "^1.4@dev",
         "ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",