Skip to content
Snippets Groups Projects
Commit 032a3cac authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'prepare-release-2.2' into 'master'

Prepare release 2.2

See merge request !793
parents f93bdf98 16a28acd
No related branches found
No related tags found
1 merge request!793Prepare release 2.2
Pipeline #42688 passed
......@@ -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.2`_ - 2021-11-29
-------------------
Added
~~~~~
......@@ -16,6 +16,11 @@ Added
* Provide views for assigning/managing permissions in frontend
* Support (icon) tabs in the top navbar.
Changed
~~~~~~~
* Update German translations.
Fixed
~~~~~
......@@ -481,3 +486,4 @@ Fixed
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0
.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1
.. _2.1.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1.1
.. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.2
......@@ -29,9 +29,9 @@ copyright = "2019, 2020, AlekSIS team"
author = "AlekSIS team"
# The short X.Y version
version = "2.1"
version = "2.2"
# The full version, including alpha/beta/rc tags
release = "2.1.1"
release = "2.2"
# -- General configuration ---------------------------------------------------
......
This diff is collapsed.
[tool.poetry]
name = "AlekSIS-Core"
version = "2.2.dev0"
version = "2.2"
packages = [
{ include = "aleksis" }
]
......@@ -29,7 +29,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-Core"
documentation = "https://aleksis.org/AlekSIS-Core/docs/html/"
keywords = ["SIS", "education", "school", "digitisation", "school apps"]
classifiers = [
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django :: 3.0",
"Intended Audience :: Developers",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment