Merge pull request #326 from symfony-cmf/update-dependencies

updating dependencies
symfony-cmf · Apr 4, 2016 · bb07f3f · bb07f3f
2 parents 69bf877 + f063dd4
commit bb07f3f
Show file tree

Hide file tree

Showing 3 changed files with 327 additions and 332 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1 +1,3 @@
 preset: symfony
+
+disabled: [phpdoc_to_comment]
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "sonata-project/cache-bundle": "^2.1",
         "sonata-project/doctrine-phpcr-admin-bundle": "1.2.*",
         "sonata-project/admin-bundle": "^2.3.3",
-        "sonata-project/translation-bundle": "1.0.0",
+        "sonata-project/translation-bundle": "1.0.0|^1.0.2",
 
         "jms/serializer-bundle": "^0.13|^1.0",
         "friendsofsymfony/rest-bundle": "~1.7",