Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/7391'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed May 4, 2015
3 parents ae6d7f5 + 4926961 + 7d4aa56 commit 87b312f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.3-dev",
"dev-develop": "2.4-dev"
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
}
},
"autoload-dev": {
Expand Down

0 comments on commit 87b312f

Please sign in to comment.