Ocelot-Social

mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-03 16:15:36 +00:00

History

Wolfgang Huß 21fcc094a6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 18-release-v2.1.X-XXX-fixes-groups-page

# Conflicts:
#	branding/constants/headerMenu.js
#	branding/constants/links.js
#	branding/constants/logos.js
#	package.json

2022-10-28 20:00:15 +02:00

donation.js

2022-10-28 20:00:15 +02:00

emails.js

resolve conflicts

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

groups.js

2022-10-22 21:06:45 +02:00

headerMenu.js

2022-10-28 20:00:15 +02:00

links.js

2022-10-28 20:00:15 +02:00

logos.js

2022-10-28 20:00:15 +02:00

metadata.js

Change owner data etc.

2022-10-26 13:48:03 +02:00