2 Commits

Author SHA1 Message Date
Wolfgang Huß
a55fa21cdd Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding
# Conflicts:
#	branding/constants/emails.js
#	branding/constants/links.js
#	package.json
2021-08-16 15:29:25 +02:00
Wolfgang Huß
aa305df9f3 Rename to 'docker-compose.wirsocial.yml' 2021-06-08 14:46:30 +02:00