Skip to content
Commit d62d5eef authored by Alexander Tyapkov's avatar Alexander Tyapkov
Browse files

Merge branch '397-recruitment-status' of...

Merge branch '397-recruitment-status' of https://git.mpib-berlin.mpg.de/castellum/castellum into 397-recruitment-status

# Conflicts:
#	castellum_core/castellum_core/recruitment/admin.py
#	castellum_core/castellum_core/recruitment/migrations/0001_initial.py
#	castellum_core/castellum_core/recruitment/models.py
#	castellum_core/castellum_core/recruitment/templates/recruitment/subject_detail_view.html
#	castellum_core/castellum_core/recruitment/views.py
parent 6c836b1e
Pipeline #417 passed with stages
in 6 minutes
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