Skip to content

Commit

Permalink
Reconfigurer for 1.4.0-beta1 release
Browse files Browse the repository at this point in the history
Merge branch 'platform:master' into studio:master

Conflicts:
	composer.json
  • Loading branch information
andrerom committed Jun 16, 2016
2 parents 3ca3413 + 6eda4bd commit 8bca19a
Show file tree
Hide file tree
Showing 2 changed files with 6,293 additions and 12 deletions.
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
"sensio/distribution-bundle": "~3.0",
"sensio/generator-bundle": "~2.3",
"incenteev/composer-parameter-handler": "~2.0",
"tedivm/stash-bundle": "~0.4.3",
"ezsystems/ezpublish-kernel": "^6.3@dev",
"ezsystems/repository-forms": "^1.2@dev",
"ezsystems/ezplatform-solr-search-engine": "~1.0@dev",
"ezsystems/platform-ui-bundle": "^1.3@dev",
"ezsystems/ez-support-tools": "~0.1.0@dev",
"ezsystems/studio-ui-bundle": "^1.3@dev",
"ezsystems/ezstudio-notifications": "^1.1@dev",
"ezsystems/landing-page-fieldtype-bundle": "^1.3@dev",
"ezsystems/flex-workflow": "^1.3@dev",
"tedivm/stash-bundle": "~0.4",
"ezsystems/ezpublish-kernel": "^6.4@beta",
"ezsystems/repository-forms": "^1.3@beta",
"ezsystems/ezplatform-solr-search-engine": "~1.0@rc",
"ezsystems/platform-ui-bundle": "^1.4@beta",
"ezsystems/ez-support-tools": "~0.1.0",
"ezsystems/studio-ui-bundle": "^1.4@beta",
"ezsystems/ezstudio-notifications": "^1.1@beta",
"ezsystems/landing-page-fieldtype-bundle": "^1.4@beta",
"ezsystems/flex-workflow": "^1.3@beta",
"egulias/listeners-debug-command-bundle": "~1.9",
"hautelook/templated-uri-bundle": "~1.0 | ~2.0",
"doctrine/doctrine-bundle": "~1.3",
"symfony/expression-language": "~2.4",
"sensio/framework-extra-bundle": "~3.0",
"ezsystems/ezstudio-installer": "^1.0@dev"
"ezsystems/ezstudio-installer": "^1.0@beta"
},
"require-dev": {
"behat/behat": "~3.0",
Expand All @@ -53,7 +53,7 @@
"behat/mink-goutte-driver": "*",
"behat/mink-selenium2-driver": "*",
"jarnaiz/behat-junit-formatter": "^1.3",
"ezsystems/behatbundle": "^6.3@dev"
"ezsystems/behatbundle": "^6.3"
},
"suggest": {
"ezsystems/legacy-bridge": "Provides the full legacy backoffice and legacy features"
Expand Down
Loading

0 comments on commit 8bca19a

Please sign in to comment.