Merge branch '2.8' into 3.0

fabpot · fabpot · commit c40bcd8394d9 · 2016-06-28T18:33:48.000+02:00
* 2.8:
  fixed typo
diff --git a/composer.json b/composer.json
@@ -79,7 +79,7 @@
         "doctrine/doctrine-bundle": "~1.4",
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
-        "egulias/email-validator": "~1.2,>=1.2.1"
+        "egulias/email-validator": "~1.2,>=1.2.1",
         "symfony/polyfill-apcu": "~1.1",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection": "^1.0.7"
