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
152 parents ffcb2c0 + ba04141 + d62d53e + 173fdb9 + 7a34617 + 4b7c2dd + 87209b0 + 58a623e + 829b708 + 1fcfba3 + 3615dc2 + 7e47a02 + 7938fdd + dfd9ef1 + 5dac197 + 9d93ff3 + 3c8246c + fb7fe0d + b48b6da + 2059af5 + 4ae89ca + cf168bb + 408e6bb + 9f0ffb8 + 7ecfaa2 + 6a7896d + 8155a5c + 8ee5274 + 72c713c + 8ab0513 + 91eef93 + fce24bf + c98293e + ec0fa7a + 2480ecd + 6cbdeb6 + 0199841 + d0ceadd + b97ed64 + 5c81acc + c5ba1f2 + e88cbee + 2bb2543 + 6b85d76 + fd4fc1d + 3cfe9f5 + 65185d9 + b2638b1 + aa2dce6 + 55b2216 + 31dd8a4 + 9ff9be3 + e1d654d + 76a55f3 + 5da873b + 671e880 + adb24c8 + 747da8c + f10d37b + 236506b + b82daca + 8448457 + 6aae974 + 553bc5e + 8034fb8 + 93bfd1f + 60514d9 + fb2affc + 0c035b2 + a837c00 + 7f54326 + 2aa633d + 5b66a63 + 5ab46dd + e59b115 + 76643a9 + c3c4da3 + f86842a + c09b55e + 44b848c + 5a4da57 + d43bca0 + cd5dffb + 5d7867c + 1f8bc83 + c5ab2f3 + 7a52da4 + bb2812c + f7972b4 + 0abbe02 + aefc063 + b47bdc4 + 8b3028a + 1b8822c + 4030a36 + ca4117d + a3994fc + 370778a + 759aeb3 + c30b3a1 + adc7329 + 612a636 + 32d2e16 + 341bf73 + e7e036f + 78908ef + 4681cd6 + 48b29d9 + 2b55177 + a4d8212 + 065fc43 + efaac86 + ea7550c + e2c7598 + 2e787c6 + be4f66c + f4112ef + c78bda6 + 50fa70e + 39305c8 + b576f04 + 0d6e151 + ae88ee0 + 31f4740 + 8f36ec1 + d3700db + 21a09bf + e078447 + d601abc + 45ba6c6 + 387c1b2 + 17de8c2 + faea519 + b0a48ab + 93ceca1 + 71b7099 + 26f0e1e + 484a184 + e03f098 + f088864 + d134eee + 825d49a + a643aed + a4c0369 + 1d51a5b + 093d8c8 + 55c966b + bb18304 + 60fa1b6 + 0f792c4 + 883bb55 + c7afaab commit 88b8317
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 @@ -35,8 +35,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 88b8317

Please sign in to comment.