Commit b1043400 authored by Mathias Lund Ahrn's avatar Mathias Lund Ahrn
Browse files

Merge branch 'master' into 'testing'

# Conflicts:
#   backend/secfit/secfit/settings.py
parents 6eb4467c 37f14a8e
Pipeline #113886 passed with stage
in 29 seconds
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment