Permalink
Browse files

Merge remote-tracking branch 'simensen/make-3-0-x-dev-installable'

  • Loading branch information...
2 parents 0d0a3af + 42e4656 commit fe03894f166a391e309b83b5e1ed39ca81b14355 @mtdowling mtdowling committed Dec 10, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 composer.json
View
@@ -21,5 +21,10 @@
"autoload": {
"psr-0": { "Guzzle\\Http": "" }
},
- "target-dir": "Guzzle/Http"
+ "target-dir": "Guzzle/Http",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ }
}

0 comments on commit fe03894

Please sign in to comment.