From 2a4c2b0b5f2386e5278126b80804ac8d9efccbad Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <sullivan@nexylan.com>
Date: Mon, 29 Jun 2015 13:47:16 +0200
Subject: [PATCH] Bump jms/serializer-bundle requirement to include ~1.0

---
 CHANGELOG.md  | 3 +++
 composer.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d996b8168..73d9dc7f1 100644
--- 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
index 93aec3520..7e46fd497 100644
--- 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"
     },