mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2026-01-20 20:01:25 +00:00
ec28b20d0d
# Conflicts: # webapp/constants/links.js # webapp/locales/html/de/code-of-conduct.html # webapp/locales/html/de/data-privacy.html # webapp/locales/html/de/faq.html # webapp/locales/html/de/imprint.html # webapp/locales/html/de/support.html # webapp/locales/html/de/terms-and-conditions.html # webapp/locales/html/en/code-of-conduct.html # webapp/locales/html/en/data-privacy.html # webapp/locales/html/en/donate.html # webapp/locales/html/en/faq.html # webapp/locales/html/en/imprint.html # webapp/locales/html/en/organization.html # webapp/locales/html/en/support.html # webapp/locales/html/en/terms-and-conditions.html