Skip to content
GitLab
Explore
Sign in
This is an archived project. Repository and other project resources are read-only.
thalia
concrexit
Repository
concrexit
website
thaliawebsite
urls.py
Find file
Blame
History
Permalink
Merge branch 'master' into 25-mailinglists
· 8c6601ef
Joost Rijneveld
authored
Aug 05, 2016
Conflicts: website/thaliawebsite/settings/settings.py
8c6601ef