Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'upstream/master'
  • Loading branch information
brookinsconsulting committed Jun 15, 2018
2 parents 797fd61 + 43a8e5e commit 7bf7ea9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions composer.json
Expand Up @@ -35,15 +35,15 @@
"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/ezpublish-kernel": "^7.2@dev",
"ezsystems/repository-forms": "^2.2@dev",
"ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
"ezsystems/ez-support-tools": "^0.2@dev",
"ezsystems/ezplatform-http-cache": "~0.6.0@dev",
"ezsystems/ezplatform-admin-ui": "^1.1@dev",
"ezsystems/ezplatform-admin-ui-modules": "^1.1@dev",
"ezsystems/ezplatform-http-cache": "^0.7@dev",
"ezsystems/ezplatform-admin-ui": "^1.2@dev",
"ezsystems/ezplatform-admin-ui-modules": "^1.2@dev",
"ezsystems/ezplatform-admin-ui-assets": "^3.0@dev",
"ezsystems/ezplatform-design-engine": "^1.1",
"ezsystems/ezplatform-design-engine": "^2.0@dev",
"ezsystems/ezplatform-cron": "^2.0@dev",
"knplabs/knp-menu-bundle": "^2.1",
"willdurand/js-translation-bundle": "^2.6.4",
Expand Down

0 comments on commit 7bf7ea9

Please sign in to comment.