aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Enderlin <ivan.enderlin@hoa-project.net>2014-09-23 16:34:27 +0200
committerIvan Enderlin <ivan.enderlin@hoa-project.net>2014-09-23 16:34:27 +0200
commit563393a14d401cf623b4d6f5273e27aba3a3272c (patch)
treee64ea8b3af09daa7b23afddea5681e3ba547ebfd
parenta7c4b2fe44a9acf26c86b5f830acfc2e97c7ee82 (diff)
parent5c9f9cd25b9b89bfda6c083e6feb3794d34d21d4 (diff)
downloadMime-563393a14d401cf623b4d6f5273e27aba3a3272c.zip
Mime-563393a14d401cf623b4d6f5273e27aba3a3272c.tar.gz
Mime-563393a14d401cf623b4d6f5273e27aba3a3272c.tar.bz2
Merge branch 'pr/8' into incoming2.14.09.23
-rw-r--r--composer.json7
1 files changed, 6 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index bfb30a5..a0f0212 100644
--- a/composer.json
+++ b/composer.json
@@ -28,5 +28,10 @@
"hoa/file": "~0.0"
},
"target-dir": "Hoa/Mime",
- "autoload" : { "psr-0": { "Hoa\\Mime": "." } }
+ "autoload" : { "psr-0": { "Hoa\\Mime": "." } },
+ "extra" : {
+ "branch-alias": {
+ "dev-master": "2.x-dev"
+ }
+ }
}