Merge branch '2.3'

Conflicts: CHANGELOG.md composer.json
ksom · Jun 29, 2015 · 2b32d55 · 2b32d55
2 parents 66560e4 + 7fe0949
commit 2b32d55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ A [BC BREAK] means the update will break the project for many reasons:
 * new dependencies
 * class refactoring
 
+### 2015-06-29
+
+* Bump `jms/serializer-bundle` requirement to include ~1.0
+
+
 ### 2015-04-03
 
 * [BC BREAK] Add `formats` param to `removeThumbnails` method of `MediaProviderInterface`

diff --git a/composer.json b/composer.json
@@ -27,8 +27,7 @@
         "imagine/imagine": "~0.3",
         "kriswallsmith/buzz": "~0.6",
         "friendsofsymfony/rest-bundle": "~1.1",
-        "jms/serializer-bundle": "~0.11",
-        "jms/serializer": "~0.13",
+        "jms/serializer-bundle": "~0.11|~1.0",
         "nelmio/api-doc-bundle": "~2.4",
         "sonata-project/intl-bundle": "~2.2"
     },
@@ -52,6 +51,9 @@
         "sonata-project/seo-bundle": "^1.1.5",
         "tilleuls/ckeditor-sonata-mediabundle": "~1.0"
     },
+    "conflict": {
+        "jms/serializer": "<0.13"
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {