Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
brookinsconsulting committed Nov 1, 2018
2 parents fd5cf30 + 7f25906 commit 9f15430e713a6f907c354dada1bf38abe03f2337
Showing with 10 additions and 6 deletions.
  1. +4 −0 app/config/env/generic.php
  2. +6 −6 composer.json
@@ -71,3 +71,7 @@
if ($value = getenv('SESSION_HANDLER_ID')) {
$container->setParameter('ezplatform.session.handler_id', $value);
}
if ($value = getenv('SESSION_SAVE_PATH')) {
$container->setParameter('ezplatform.session.save_path', $value);
}
@@ -35,13 +35,13 @@
"doctrine/orm": "^2.5",
"sensio/distribution-bundle": "^5.0.22",
"incenteev/composer-parameter-handler": "^2.1.3",
"ezsystems/ezpublish-kernel": "^7.3@dev",
"ezsystems/repository-forms": "^2.3@dev",
"ezsystems/ezpublish-kernel": "^7.4@dev",
"ezsystems/repository-forms": "^2.4@dev",
"ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
"ezsystems/ez-support-tools": "^0.2@dev",
"ezsystems/ezplatform-http-cache": "^0.8@dev",
"ezsystems/ezplatform-admin-ui": "^1.3@dev",
"ezsystems/ezplatform-admin-ui-modules": "^1.3@dev",
"ezsystems/ezplatform-http-cache": "^0.9@dev",
"ezsystems/ezplatform-admin-ui": "^1.4@dev",
"ezsystems/ezplatform-admin-ui-modules": "^1.4@dev",
"ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",
"ezsystems/ezplatform-design-engine": "^2.0@dev",
"ezsystems/ezplatform-standard-design": "^0.1@dev",
@@ -111,7 +111,7 @@
"file": "app/config/parameters.yml"
},
"branch-alias": {
"dev-master": "2.3.x-dev"
"dev-master": "2.4.x-dev"
}
}
}

0 comments on commit 9f15430

Please sign in to comment.