From fd4125f90e061ba1e14a8071c12d6ae5287d468e Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Thu, 3 Jan 2019 13:49:30 +0100
Subject: [PATCH] prepare release 2.5.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af42fccde..63c22056d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 CHANGELOG
 =========
 
+2.5.0
+-----
+
+* compatibility with Symfony 4.2
+* deprecated the `FOSRestController` base class, use the new `AbstractFOSRestController` instead
+* dropped support for Symfony 2.7 to 3.3
+* compatibility with JMS Serializer 2 and JMSSerializerBundle 3
+* overwrite rules when they are defined in different config files instead of throwing exceptions
+* fixed using the `nullable` option of the param annotations when the `map` option is enabled
+* ensure a predictable order of routes by sorting controllers by name when loading classes from a directory
+* reset the internal state of the view handler to fix compatibility with PHP-PM
+* fix different bugs related to the handling of API versions (see #1491, #1529, #1691)
+
 2.4.0
 -----
 
diff --git a/composer.json b/composer.json
index 6655937bb..d5e9203c9 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev"
+            "dev-master": "2.5-dev"
         }
     }
 }