summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Mattia Gonano <ciromattia@gmail.com>2013-03-01 12:14:49 +0100
committerCiro Mattia Gonano <ciromattia@gmail.com>2013-03-01 12:14:49 +0100
commitcbaff7bb32cf3069375b99b2e0e803e5a271f256 (patch)
tree37177b85876b801480e757fee8c4773de112fc04
parent8da817095c1c5026768545c7750b873d8bbbbffe (diff)
Composer update
-rw-r--r--composer.json5
1 files changed, 0 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index b13cf881..d37c4fd4 100644
--- a/composer.json
+++ b/composer.json
@@ -6,10 +6,5 @@
"include-path": ["framework"],
"require": {
"php": ">=5.2.4"
- },
- "extra": {
- "branch-alias": {
- "dev-master": "3.2"
- }
}
}