Merge branch '2.8'

Tobion · Tobion · commit af86f8406ce3 · 2015-10-28T18:34:03.000+01:00
Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     },
     "require": {
         "php": ">=5.5.9",
-        "symfony/symfony": "3.0.x-dev",
+        "symfony/symfony": "3.0.*@dev",
         "doctrine/orm": "^2.4.8",
         "doctrine/doctrine-bundle": "~1.4",
         "symfony/swiftmailer-bundle": "~2.3",
