Skip to content
Snippets Groups Projects
Commit 67aea25f authored by Alexander Schoch's avatar Alexander Schoch
Browse files

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
parents 970baf52 253c2dde
No related branches found
No related tags found
Loading
Showing
No files found.
with 0 additions and 0 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment