Merge branch 'master-ocelot'

# Conflicts:
#	package.json
This commit is contained in:
Ulf Gebhardt 2022-12-07 00:13:57 +01:00
commit 97911f809a
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9

View File

@ -1,7 +1,7 @@
{
"name": "yunite.me",
"version": "2.2.0",
"ocelotDockerVersionTag": "2.2.0-267",
"ocelotDockerVersionTag": "2.3.0-281",
"dockerOrganisation": "tirokk",
"description": "yunite.me Alternatives Netzwerk für eine freie und bunte Zukunft",
"author": "yunite Verein für Vernetzung und Kooperation",