Merge branch 'main' into 'dev'
# Conflicts: # components/eventCard.jsx # components/signUpsModal.jsx # components/toc.jsx # graphql/resolvers.js # graphql/schema.js # public/locales/de/common.json # public/locales/en/common.json # styles/globals.css # thealternative.config.js # utilities/dates.js # utilities/hasAccess.js
Showing
No files found.
Loading
Please register or sign in to comment