From c79a54fd5abb792696420aa6427a5e5a356fa79c Mon Sep 17 00:00:00 2001 From: "deliverino[bot]" <62934656+deliverino[bot]@users.noreply.github.com> Date: Fri, 3 Jun 2022 12:58:25 +0000 Subject: [PATCH] Bump version to 2022.6.0 [skip ci] --- CHANGELOG.md | 4 ++++ integreat_cms/__init__.py | 2 +- setup.cfg | 4 ++-- sphinx/conf.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9414543d5..008eff4182 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ UNRELEASED ---------- + +2022.6.0 +-------- + * [ [#1501](https://github.com/digitalfabrik/integreat-cms/issues/1501) ] Remove formatting when content is pasted into tinymce editor * [ [#1514](https://github.com/digitalfabrik/integreat-cms/issues/1514) ] Fix format of region aliases in API * [ [#1503](https://github.com/digitalfabrik/integreat-cms/issues/1503) ] Fix expanding feedback not working diff --git a/integreat_cms/__init__.py b/integreat_cms/__init__.py index 3242fdf559..60b8a59925 100644 --- a/integreat_cms/__init__.py +++ b/integreat_cms/__init__.py @@ -1 +1 @@ -__version__ = "2022.5.4" +__version__ = "2022.6.0" diff --git a/setup.cfg b/setup.cfg index 551147f554..364353a51d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = integreat-cms -version = 2022.5.4 +version = 2022.6.0 author = Tür an Tür – Digitalfabrik gGmbH author_email = tech@integreat-app.de description = Content Management System for the Integreat App @@ -74,7 +74,7 @@ include_package_data = True scripts = integreat_cms/integreat-cms-cli [bumpver] -current_version = 2022.5.4 +current_version = 2022.6.0 version_pattern = YYYY.MM.INC0[-TAG] commit_message = Bump version to {new_version} diff --git a/sphinx/conf.py b/sphinx/conf.py index 2b8455924d..19207c979c 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -49,7 +49,7 @@ django_github_url = f"https://github.com/django/django/blob/stable/{django_version}.x" #: The full version, including alpha/beta/rc tags -release = "2022.5.4" +release = "2022.6.0" # -- General configuration ---------------------------------------------------