Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 5059-epic-groups

# Conflicts:
#	package.json
This commit is contained in:
Wolfgang Huß 2022-10-25 18:21:09 +02:00
commit 0d1eac9928

View File

@ -1,7 +1,7 @@
{ {
"name": "yunite.net", "name": "yunite.net",
"version": "2.0.0", "version": "2.1.0",
"ocelotDockerVersionTag": "2.0.0-250", "ocelotDockerVersionTag": "2.1.0-253",
"dockerOrganisation": "tirokk", "dockerOrganisation": "tirokk",
"description": "yunite.net Branded", "description": "yunite.net Branded",
"author": "yunite.net Community", "author": "yunite.net Community",