summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Mattia Gonano <ciromattia@gmail.com>2013-03-01 11:18:41 +0100
committerCiro Mattia Gonano <ciromattia@gmail.com>2013-03-01 11:18:41 +0100
commit6e7998ec583cf701ad45ab29475a8d484d7df073 (patch)
tree1196264c0808ba7e0837456d05277d6825c1e561
parent89f61f1bd9031b560164c70b2bb0e9083b4e0210 (diff)
Composer update
-rw-r--r--composer.json8
1 files changed, 5 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 106cdda0..8a301938 100644
--- a/composer.json
+++ b/composer.json
@@ -3,11 +3,13 @@
"description": "Component Framework for PHP 5.",
"homepage": "http://www.pradosoft.com/",
"license": "BSD",
- "autoload": {
- "classmap": ["framework"]
- },
"include-path": ["framework"],
"require": {
"php": ">=5.2.4"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.7-dev"
+ }
}
}