Merge 2.x into master

CHANGELOG.md

@@ -1,3 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.0.2](https://github.com/sonata-project/SonataTranslationBundle/compare/2.0.1...2.0.2) - 2016-06-15
+### Fixed
+- Remove wrong `doctrine-orm-admin-bundle` and `doctrine-phpcr-admin-bundle` composer requirements
+
+## [2.0.1](https://github.com/sonata-project/SonataTranslationBundle/compare/2.0.0...2.0.1) - 2016-06-07
+### Fixed
+- Fix wrong conflict rule for `doctrine-orm-admin-bundle`

composer.json

@@ -31,14 +31,13 @@
         "symfony/phpunit-bridge": "^2.7 || ^3.0"
     },
     "suggest": {
+        "doctrine/phpcr-odm": "if you translate odm documents",
         "knplabs/doctrine-behaviors": "if you translate orm entities with the knplabs behaviours",
-        "sonata-project/doctrine-orm-admin-bundle": "if you persist orm entities",
-        "sonata-project/doctrine-phpcr-admin-bundle": "if you persist phpcr-odm documents",
         "stof/doctrine-extensions-bundle": "if you translate orm entities with the gedmo extensions"
     },
     "conflict": {
+        "doctrine/phpcr-odm": ">=2.0",
         "knplabs/doctrine-behaviors": "<1.0 || >=2.0",
-        "sonata-project/doctrine-orm-admin-bundle": "<3.0 || >=4.0",
         "stof/doctrine-extensions-bundle": "<1.1 || >=2.0"
     },
     "autoload": {