updated version to 2.6

fabpot · fabpot · commit 303c418e1546 · 2014-05-23T16:42:55.000+02:00
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "2.5.x-dev",
+        "symfony/symfony": "2.6.x-dev",
         "doctrine/orm": "~2.2,>=2.2.3",
         "doctrine/doctrine-bundle": "~1.2",
         "twig/extensions": "~1.0",
@@ -53,7 +53,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.5-dev"
+            "dev-master": "2.6-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`},`
`9`	`9`	`"require": {`
`10`	`10`	`"php": ">=5.3.3",`
`11`		`- "symfony/symfony": "2.5.x-dev",`
	`11`	`+ "symfony/symfony": "2.6.x-dev",`
`12`	`12`	`"doctrine/orm": "~2.2,>=2.2.3",`
`13`	`13`	`"doctrine/doctrine-bundle": "~1.2",`
`14`	`14`	`"twig/extensions": "~1.0",`
`@@ -53,7 +53,7 @@`
`53`	`53`	`"file": "app/config/parameters.yml"`
`54`	`54`	`},`
`55`	`55`	`"branch-alias": {`
`56`		`- "dev-master": "2.5-dev"`
	`56`	`+ "dev-master": "2.6-dev"`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`