Merge pull request #247 from symfony-cmf/release-2.0

prepare release 2.0
symfony-cmf · Mar 31, 2016 · 3485ba8 · 3485ba8
2 parents c391535 + 44a282d
commit 3485ba8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DEPS=dev
+      env: DEPS=dev SYMFONY_VERSION=2.8.*
     - php: 5.3
       env: SYMFONY_VERSION="^2.3.4" COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+2.0.0
+-----
+
 2.0.0-RC1
 ---------
 

diff --git a/composer.json b/composer.json
@@ -14,17 +14,17 @@
     "require": {
         "php": "^5.3.9|^7.0",
         "symfony/framework-bundle": "^2.3",
-        "symfony-cmf/core-bundle": "^1.1.0-RC3",
+        "symfony-cmf/core-bundle": "^1.1.0",
         "doctrine/phpcr-bundle": "^1.1",
         "doctrine/phpcr-odm": "^1.1",
         "knplabs/knp-menu-bundle": "^2.0.0",
         "knplabs/knp-menu": "^2.0.0"
     },
     "require-dev": {
         "symfony/monolog-bundle": "^2.3",
-        "symfony-cmf/routing-bundle": "^1.2.0-RC3",
-        "symfony-cmf/testing": "^1.3@dev",
-        "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1",
+        "symfony-cmf/routing-bundle": "^1.2.0",
+        "symfony-cmf/testing": "^1.3",
+        "symfony-cmf/tree-browser-bundle": "^1.0.0",
         "doctrine/phpcr-odm": "^1.3",
         "twig/twig": "^1.18",
         "sonata-project/doctrine-phpcr-admin-bundle": "^1.1",