5 Commits

Author	SHA1	Message	Date
Wolfgang Huß	20c70757be	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 14-new-deployment-with-base-and-code ... # Conflicts: # branding/constants/links.js # branding/locales/html/de/code-of-conduct.html # branding/locales/html/de/data-privacy.html # branding/locales/html/de/faq.html # branding/locales/html/de/imprint.html # branding/locales/html/de/terms-and-conditions.html # branding/locales/html/en/code-of-conduct.html # branding/locales/html/en/data-privacy.html # branding/locales/html/en/faq.html # branding/locales/html/en/imprint.html # branding/locales/html/en/terms-and-conditions.html # docker/maintenance.Dockerfile # docker/webapp.Dockerfile	2021-06-07 20:46:37 +02:00
Wolfgang Huß	a03830d5c6	Correct Discord link	2021-05-31 15:57:50 +02:00
Wolfgang Huß	7fea34a71e	Change link for contribution	2021-05-25 17:07:46 +02:00
Wolfgang Huß	06fafb8cee	Change logo file name in main Readme.md	2021-05-25 16:59:27 +02:00
Wolfgang Huß	6cc5f1dff6	Add README and LICENSE	2021-05-17 09:26:09 +02:00