mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
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:
commit
0d1eac9928
@ -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",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user