Wolfgang Huß 05e4984df6 Merge branch '76-release-v2.0.0-groups-extend-rebranding-and-deployment' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable ...

# Conflicts:
#	README.md
#	TODO-next-update.md
#	branding/constants/groups.js
#	branding/constants/headerMenu.js
#	branding/constants/logos.js

2022-10-22 21:06:45 +02:00

..

emails.js

resolve conflicts

2022-09-23 08:45:41 +02:00

groups.js

Merge branch '76-release-v2.0.0-groups-extend-rebranding-and-deployment' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable

2022-10-22 21:06:45 +02:00

headerMenu.js

Adjust the footer

2022-10-22 20:46:38 +02:00

links.js

Adjust the footer

2022-10-22 20:46:38 +02:00

logos.js

Merge branch '76-release-v2.0.0-groups-extend-rebranding-and-deployment' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 15-release-v1.1.2-XXX-configurable-header-menu-is-translatable

2022-10-22 21:06:45 +02:00

metadata.js

resolve conflicts

2022-09-23 08:45:41 +02:00