From e5a38d036f23627b6fff0760d18b382b8f447bb2 Mon Sep 17 00:00:00 2001
From: Timo Ludwig <ti.ludwig@web.de>
Date: Mon, 2 Jan 2023 22:29:51 +0100
Subject: [PATCH] Bump to v2.0

---
 CHANGES.rst                      | 10 ++++++++--
 sphinxcontrib_django/__init__.py |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6c35d9b..b7dee01 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,16 @@
 Changelog
 =========
 
-Version 1.6 (2022-11-24)
+Version 2.0 (2023-01-02)
 ------------------------
 
-*Versions 0.6 until 1.6 were releases of the fork* `sphinxcontrib_django2 <https://pypi.org/project/sphinxcontrib-django2/>`_.
+Merge fork `sphinxcontrib_django2 <https://pypi.org/project/sphinxcontrib-django2/>`_ back into `sphinxcontrib_django <https://pypi.org/project/sphinxcontrib-django/>`_.
+
+*Versions 0.6 until 1.6 were releases of the fork. With version 2.0, the changes are included in the original package again.*
+
+
+Version 1.6 (2022-11-24)
+------------------------
 
 * Add inline docstrings of model fields to parameter documentation of models
 * Add support for Python 3.11
diff --git a/sphinxcontrib_django/__init__.py b/sphinxcontrib_django/__init__.py
index 094a4a2..b674a05 100644
--- a/sphinxcontrib_django/__init__.py
+++ b/sphinxcontrib_django/__init__.py
@@ -1,7 +1,7 @@
 """
 This is a sphinx extension which improves the documentation of Django apps.
 """
-__version__ = "1.6"
+__version__ = "2.0"
 
 from . import docstrings, roles