From dbdf8d1141b398e6bf8fbf1e899e2aa18aa29d07 Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Sun, 22 Dec 2024 10:08:40 +0100
Subject: [PATCH] Release 25.1.2

Changed
- show error message in add feed dialog and keep it open if the feed could not be added (#2988)
- keep margins the same even if an article does not use max width (#2995)

Fixed
- adding feed via web-ui always use auto-discover (#2988)
- show 403 forbidden errors when fetching feeds (#2988)
- prevent move feed dialog from being closed unexpectedly (#2995)
- don't abort `opml` import when a single feed exists or can't be added (#2996)

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 CHANGELOG.md     | 17 +++++++++++------
 appinfo/info.xml |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32891eac2..59896d699 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,21 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 # Unreleased
 ## [25.x.x]
 ### Changed
-- show error message in add feed dialog and keep it open if the feed could not be added
-- keep margins the same even if an article does not use max width
 
 ### Fixed
-- adding feed via web-ui always use auto-discover
-- show 403 forbidden errors when fetching feeds
-- prevent move feed dialog from being closed unexpectedly
-- don't abort `opml` import when a single feed exists or can't be added
 
 # Releases
+## [25.1.2] - 2024-12-22
+### Changed
+- show error message in add feed dialog and keep it open if the feed could not be added (#2988)
+- keep margins the same even if an article does not use max width (#2995)
+
+### Fixed
+- adding feed via web-ui always use auto-discover (#2988)
+- show 403 forbidden errors when fetching feeds (#2988)
+- prevent move feed dialog from being closed unexpectedly (#2995)
+- don't abort `opml` import when a single feed exists or can't be added (#2996)
+
 ## [25.1.1] - 2024-12-16
 ### Changed
 - Show red error bubble only if more than 8 updates fail. (#2955)
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 63f5b2925..f1493b8c0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
 
 Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
     ]]></description>
-    <version>25.1.1</version>
+    <version>25.1.2</version>
     <licence>agpl</licence>
     <author>Benjamin Brahmer</author>
     <author>Sean Molenaar</author>