Skip to content

Commit 08a2163

Browse files
committed
Prepare 2.0.0-RC2
1 parent 23631d7 commit 08a2163

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Changelog
22
=========
33

4+
2.0.0-RC2
5+
---------
6+
47
* **2017-02-06**: [BC BREAK] The `_template` request parameter will be renamed
58
to the `template` attribute instead of the `contentTemplate` attribute. The
69
old attribute will still be available for backwards compatibility.

UPGRADE-2.0.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
- cmf_sonata_admin_integration.routing.redirect_route_admin
6969
```
7070
71-
* The settings `admin_basepath` and `content_basepath` are only relevant for the admin and thus have been moved as well.
71+
* The settings `admin_basepath` and `content_basepath` are only relevant for
72+
the admin and thus have been moved as well.
7273

7374
Before:
7475

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"require-dev": {
2020
"symfony-cmf/testing": "^2.0",
21-
"doctrine/phpcr-odm": "^1.4|^2.0",
21+
"doctrine/phpcr-odm": "^1.4",
2222
"symfony/phpunit-bridge": "^3.2",
2323
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2424
"matthiasnoback/symfony-config-test": "^1.3.1",

0 commit comments

Comments
 (0)