Skip to content
Snippets Groups Projects
Commit c45978b8 authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'master' into 'feature-custom-admin' 

# Conflicts:
#   AKSubmission/locale/de_DE/LC_MESSAGES/django.po
parents 01e7d3c0 01ccf980
No related branches found
No related tags found
1 merge request!39Introduce custom admin
Pipeline #4030 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 17 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment