Skip to content
Snippets Groups Projects
Commit 5a0e3833 authored by Kristoffer Håkon Håkonsen's avatar Kristoffer Håkon Håkonsen
Browse files

Merge branch 'master' into 'integration_test_uc1' 

# Conflicts:
#   backend/secfit/workouts/tests.py
parents c897a1a6 c4646d70
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
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