SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit f5d1be09 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

Merge conflict manually solved 

Merge conflict fixed in `theses_detail`,
 due to a hotfix in commit `4d42a5d8`.
parents 8cefdb44 88808837
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 952 additions and 11 deletions
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

SciPost Code Repository