Merge pull request sonata-project#803 from Soullivaneuh/jms-serializer

Bump jms/serializer-bundle requirement to include ~1.0
ksom · Jun 29, 2015 · 7fe0949 · 7fe0949
2 parents be9409c + 2a4c2b0
commit 7fe0949
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ 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
 
 ### 2014-05-02
 

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "imagine/Imagine": "*@stable",
         "kriswallsmith/buzz": "0.*",
         "friendsofsymfony/rest-bundle": "~1.1",
-        "jms/serializer-bundle": "~0.11",
+        "jms/serializer-bundle": "~0.11|~1.0",
         "nelmio/api-doc-bundle": "~2.4",
         "sonata-project/intl-bundle": "~2.2"
     },