Ulf Gebhardt 52c90af25b

Merge branch 'master-ocelot' into 11-release-v1.0.8-fix-cookies-and-password-reset-etc ...

# Conflicts:
#	.github/workflows/publish.yml
#	README.md
#	docker-compose.wirsocial.yml
#	package.json

2022-10-15 10:59:51 +02:00

..

emails.js

Correct and fix links

2021-08-16 15:33:52 +02:00

headerMenu.js

refactor rebranding

2022-09-22 19:49:24 +02:00

links.js

Add internal organization page instead of Ulf's company page

2022-06-30 15:52:42 +02:00

logos.js

refactor rebranding

2022-09-22 19:49:24 +02:00

metadata.js

Correct 'metadata.js'

2021-06-07 21:26:50 +02:00