From d84efaee3137149b7b5300b6f11f9329a6e908d9 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Thu, 31 Aug 2023 00:07:45 +0300
Subject: [PATCH 1/2] Revert "Bump django-grappelli from 3.0.6 to 3.0.7"

This reverts commit 35ec1eb72adea76181f7a78f2c5dfcb04a5ece63.
---
 requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 7c28489d94..bcb6259f26 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -8,7 +8,7 @@ django-attachments==1.11
 django-colorfield==0.9.0
 django-contrib-comments==2.2.0
 django-extensions==3.2.3
-django-grappelli==3.0.7
+django-grappelli==3.0.6
 django-guardian==2.4.0
 django-modern-rpc==0.12.1
 django-simple-history==3.3.0

From 74dd0b8b0bb34386d509bdc25ff565e617fe2d81 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Thu, 31 Aug 2023 00:08:34 +0300
Subject: [PATCH 2/2] Changelog for v12.6.1

---
 CHANGELOG.rst    | 5 ++---
 tcms/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index adcb1e0d89..c185703345 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,8 +1,8 @@
 Change Log
 ==========
 
-Kiwi TCMS 12.6 (30 Aug 2023)
-----------------------------
+Kiwi TCMS 12.6.1 (31 Aug 2023)
+------------------------------
 
 .. important::
 
@@ -27,7 +27,6 @@ Improvements
 
 - Update allpairspy from 2.5.0 to 2.5.1
 - Update django from 4.2.3 to 4.2.4
-- Update django-grappelli from 3.0.6 to 3.0.7
 - Update mysqlclient from 2.1.1 to 2.2.0
 - Update uwsgi from 2.0.21 to 2.0.22
 - Update pygments from 2.15.1 to 2.16.1
diff --git a/tcms/__init__.py b/tcms/__init__.py
index 164293e19a..17554d49f1 100644
--- a/tcms/__init__.py
+++ b/tcms/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime
 
-__version__ = "12.6"
-__release_date__ = datetime(2023, 8, 30, 21, 1)
+__version__ = "12.6.1"
+__release_date__ = datetime(2023, 8, 31, 9, 1)