Revert "merged branch Seldaek/master (PR #4133)"

fabpot · fabpot · commit 984e186050a0 · 2012-04-27T19:55:40.000+02:00
This reverts commit 00e7a94a8c761a3e10c388e4d06cb3ce4cd04ad7, reversing
changes made to a01dec00f4e8de357cce5fdf121ac98729f7f8ff.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "target-dir": "Symfony/Component/Serializer",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2.x-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"target-dir": "Symfony/Component/Serializer",`
`25`	`25`	`"extra": {`
`26`	`26`	`"branch-alias": {`
`27`		`- "dev-master": "2.2.x-dev"`
	`27`	`+ "dev-master": "2.1-dev"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`