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

..

html

Correct spelling

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

de.json

Fix copy error by adding two empty JSON files to the locales

2022-10-13 15:13:34 +02:00

en.json

Fix copy error by adding two empty JSON files to the locales

2022-10-13 15:13:34 +02:00