Skip to content
Commit 609f6f45 authored by Tyapkov's avatar Tyapkov
Browse files

Merge branch 'master' into '943-exclusioncriteria-view' 

# Conflicts:
#   castellum/studies/templates/studies/study_recruitmentsettings.html
#   castellum/studies/urls.py
#   castellum/studies/views/studies.py
parents 148ad175 af0d1d80
Pipeline #2370 failed with stages
in 3 minutes and 21 seconds
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