Merge branch 'release/1.0.2'

rdrenth · Dec 4, 2015 · 2004c5d · 2004c5d
2 parents a918451 + 38d6c0d
commit 2004c5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.2
+* Add support for Symfony 3.0
+
 ## 1.0.1
 * Update code style
 * Removed `encoding` configuration parameter

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": ">=5.3.0",
         "ext-mbstring": "*",
-        "symfony/framework-bundle": ">=2.3,<3.0",
+        "symfony/framework-bundle": "~2.3|~3.0",
         "twig/twig": "~1.20|~2.0",
         "danielstjules/stringy": "~2.0"
     },