Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into studio_master
  • Loading branch information
andrerom committed Apr 11, 2018
2 parents f7499e0 + 1681344 commit d2e34ab
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 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 Expand Up @@ -115,7 +115,7 @@
"file": "app/config/parameters.yml"
},
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "2.2.x-dev"
}
}
}

0 comments on commit d2e34ab

Please sign in to comment.