Solve migration merge conflict :ambulance: (!257) · Merge requests · thalia / concrexit · GitLab

This is an archived project. Repository and other project resources are read-only.

Ghost User requested to merge hotline-fix into master Dec 14, 2016

that can only mean 1 thing