Skip to content
Snippets Groups Projects
Commit 94603976 authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Merge branch 'master' into submission_form

Resolve conflicts (AKSubmission views and translations)
Add merge migration
Fix owner slug migration for existing entries
parents 5297e479 1dc17247
No related branches found
No related tags found
No related merge requests found
Showing
with 306 additions and 95 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