From d125352cc22600b3467ea03480cf82c86a695239 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 10 Jan 2022 17:36:29 +0100
Subject: [PATCH] Bump version to 2.6 and update changelog

---
 CHANGELOG.rst  | 5 +++--
 docs/conf.py   | 4 ++--
 pyproject.toml | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3f8ab898b..1c6b8d83e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,8 +6,8 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
-Unreleased
-----------
+`2.6`_ - 2022-01-10
+-------------------
 
 Added
 ~~~~~
@@ -642,3 +642,4 @@ Fixed
 .. _2.3.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.3.1
 .. _2.4: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.4
 .. _2.5: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.5
+.. _2.6: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.6
diff --git a/docs/conf.py b/docs/conf.py
index 8ba336abc..bf2e67851 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,9 +29,9 @@ copyright = "2019-2022 The AlekSIS team"
 author = "The AlekSIS Team"
 
 # The short X.Y version
-version = "2.5"
+version = "2.6"
 # The full version, including alpha/beta/rc tags
-release = "2.5.1.dev0"
+release = "2.6"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index 98947c92a..c61126247 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "AlekSIS-Core"
-version = "2.5.1.dev0"
+version = "2.6"
 packages = [
     { include = "aleksis" }
 ]
-- 
GitLab