From 74b2593cb26fa89408bae56e7b906276231e77f5 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Thu, 30 Nov 2023 12:29:52 +0100
Subject: [PATCH] Version bump and changelog for 1.4.0-rc2

---
 CHANGELOG.md       | 11 +++++++++++
 api/pyproject.toml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95e37dd44..4542edff5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,17 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 <!-- towncrier -->
 
+## 1.4.0-rc2 (2023-11-30)
+
+Upgrade instructions are available at https://docs.funkwhale.audio/administrator/upgrade/index.html
+
+Changes since 1.4.0-rc1:
+
+Bugfixes:
+
+- Fix broken nginx templates for docker setup (#2252)
+- Fix docker builds in CI by using correct flag to disable cache
+
 ## 1.4.0-rc1 (2023-11-28)
 
 Upgrade instructions are available at https://docs.funkwhale.audio/administrator/upgrade/index.html
diff --git a/api/pyproject.toml b/api/pyproject.toml
index 6e361c127..f77311f64 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funkwhale-api"
-version = "1.4.0-rc1"
+version = "1.4.0-rc2"
 description = "Funkwhale API"
 
 authors = ["Funkwhale Collective"]