Merge branch '2.5' into 2.6

fabpot · fabpot · commit f98655c33bc3 · 2014-12-22T16:55:23.000+01:00
* 2.5:
  Issue #758 Modified default route for AppBundle
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
@@ -8,7 +8,7 @@
 class DefaultController extends Controller
 {
     /**
-     * @Route("/", name="homepage")
+     * @Route("/app/example", name="homepage")
      */
     public function indexAction()
     {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class DefaultController extends Controller`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`		`- * @Route("/", name="homepage")`
	`11`	`+ * @Route("/app/example", name="homepage")`
`12`	`12`	`*/`
`13`	`13`	`public function indexAction()`
`14`	`14`	`{`