Skip to content
Snippets Groups Projects
Commit 763d9c5a authored by Julian's avatar Julian
Browse files

Merge remote-tracking branch 'origin/58-remove-additional-fields-support' into...

Merge remote-tracking branch 'origin/58-remove-additional-fields-support' into 58-remove-additional-fields-support

# Conflicts:
#	aleksis/apps/paweljong/frontend/components/event_additional_field/EventAdditionalFieldList.vue
#	aleksis/apps/paweljong/frontend/messages/en.json
#	aleksis/apps/paweljong/schema.py
parents 954ea7b3 e58ab661
No related branches found
No related tags found
Loading
Checking pipeline status
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