From 232ce1e1be294224948c70654a7b379b17b61c4c Mon Sep 17 00:00:00 2001
From: Eric Park <me@ericswpark.com>
Date: Thu, 23 Nov 2023 22:58:12 -0500
Subject: [PATCH] release: 2.25.0

This release contains a database migration.

- Added preliminary x86 build support to shipper

- Fixed timedelta string not being translated (#248)
- Updated help text in the admin page
- Build variants are now handled as database model objects
- General code cleanup

- The variant configuration option has been deprecated and is slated for removal in the next release
---
 CHANGELOG.md             | 21 ++++++++++++++++++++-
 server/version.txt       |  2 +-
 shippy/shippy/version.py |  2 +-
 version.txt              |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed995f10..4998d316 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,26 @@ The format is based on [Keep a Changelog][keep-a-changelog].
 
 # [Unreleased]
 
-[Unreleased]: https://github.com/shipperstack/shipper/compare/2.24.2...HEAD
+[Unreleased]: https://github.com/shipperstack/shipper/compare/2.25.0...HEAD
+
+
+# [2.25.0] - 2023-11-23
+
+This release contains a database migration.
+
+# Added
+- Added preliminary x86 build support to shipper
+
+# Changed
+- Fixed timedelta string not being translated (#248)
+- Updated help text in the admin page
+- Build variants are now handled as database model objects
+- General code cleanup
+
+# Removed
+- The variant configuration option has been deprecated and is slated for removal in the next release
+
+[2.25.0]: https://github.com/shipperstack/shipper/compare/2.24.2...2.25.0
 
 
 # [2.24.2] - 2023-11-23
diff --git a/server/version.txt b/server/version.txt
index 3013e792..790d3503 100644
--- a/server/version.txt
+++ b/server/version.txt
@@ -1 +1 @@
-2.24.2
\ No newline at end of file
+2.25.0
\ No newline at end of file
diff --git a/shippy/shippy/version.py b/shippy/shippy/version.py
index c9eb6454..976e65a0 100644
--- a/shippy/shippy/version.py
+++ b/shippy/shippy/version.py
@@ -1 +1 @@
-__version__ = "2.24.2"
\ No newline at end of file
+__version__ = "2.25.0"
\ No newline at end of file
diff --git a/version.txt b/version.txt
index 3013e792..790d3503 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.24.2
\ No newline at end of file
+2.25.0
\ No newline at end of file