Skip to content
Snippets Groups Projects
Commit 718ad018 authored by Giske Naper Freberg's avatar Giske Naper Freberg
Browse files

Merge branch 'master' into 'feat/Frontend-select-training-type'

# Conflicts:
#   backend/secfit/workouts/models.py
#   backend/secfit/workouts/serializers.py
parents fb430edc 0ec6bcf5
Branches feat/Frontend-select-training-type
No related tags found
No related merge requests found
Showing
with 253 additions and 3 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