Skip to content

Commit

Permalink
Merge pull request #1299 from digitalfabrik/develop
Browse files Browse the repository at this point in the history
Trigger release pipeline again
  • Loading branch information
timobrembeck authored Mar 15, 2022
2 parents 3f8a684 + 1cff34b commit eff1ff7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,9 @@ workflows:
- pipenv-install
- setup-test-reporter:
context: codeclimate
filters:
branches:
ignore: main
- test:
requires:
- pipenv-install
Expand Down Expand Up @@ -476,6 +479,9 @@ workflows:
- shellcheck/check:
dir: ./dev-tools
external_sources: true
filters:
branches:
ignore: main
- build-documentation:
requires:
- pipenv-install
Expand Down
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
UNRELEASED
----------


2022.3.4
--------

* [ [#1108](https://github.com/digitalfabrik/integreat-cms/issues/1108) ] Support SVG images in PDF export
* [ [#1284](https://github.com/digitalfabrik/integreat-cms/issues/1284) ] Inherit status of new translations from source language on XLIFF import
* [ [#1047](https://github.com/digitalfabrik/integreat-cms/issues/1047) ] Provide option to only export public versions as XLIFF
Expand Down
2 changes: 1 addition & 1 deletion integreat_cms/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2022.3.4"
__version__ = "2022.3.3"
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = integreat-cms
version = 2022.3.4
version = 2022.3.3
author = Tür an Tür – Digitalfabrik gGmbH
author_email = [email protected]
description = Content Management System for the Integreat App
Expand Down Expand Up @@ -72,7 +72,7 @@ include_package_data = True
scripts = integreat_cms/integreat-cms-cli

[bumpver]
current_version = 2022.3.4
current_version = 2022.3.3
version_pattern = YYYY.MM.INC0[-TAG]
commit_message =
Bump version to {new_version}
Expand Down
2 changes: 1 addition & 1 deletion sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,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.3.4"
release = "2022.3.3"

# -- General configuration ---------------------------------------------------

Expand Down

0 comments on commit eff1ff7

Please sign in to comment.