summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordi Boggiano <j.boggiano@seld.be>2012-04-27 12:47:50 +0200
committerJordi Boggiano <j.boggiano@seld.be>2012-04-27 12:47:50 +0200
commit42ab686ec46a1b067f85caab6fd04052e2b20b0b (patch)
tree84152873c0f36b55a7cad5a1ca99c208efb9395a
parentcfcc7424c28dabf3501e48b78a2a6cebebce3ef0 (diff)
downloadsymfony-security-42ab686ec46a1b067f85caab6fd04052e2b20b0b.zip
symfony-security-42ab686ec46a1b067f85caab6fd04052e2b20b0b.tar.gz
symfony-security-42ab686ec46a1b067f85caab6fd04052e2b20b0b.tar.bz2
Update branch aliases
-rw-r--r--composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 0dbade1..b8d084f 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
"target-dir": "Symfony/Component/Security",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2.x-dev"
}
}
}