Skip to content

Commit

Permalink
Merge branch 'studio_master' into studio-demo_master
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Apr 11, 2018
2 parents bb03fcd + 13d59a9 commit 6957cb1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -43,7 +43,7 @@
"ezsystems/repository-forms": "^2.1@dev",
"ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
"ezsystems/ez-support-tools": "^0.2@dev",
"ezsystems/ezplatform-http-cache": "^0.5@dev",
"ezsystems/ezplatform-http-cache": "~0.6@dev",
"ezsystems/ezplatform-admin-ui": "^1.1@dev",
"ezsystems/ezplatform-admin-ui-modules": "^1.1@dev",
"ezsystems/ezplatform-admin-ui-assets": "^2.0@dev",
Expand Down

0 comments on commit 6957cb1

Please sign in to comment.