Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Repository
a8052126f5d91b292066a71e80b78cfe944c7ae0
Switch branch/tag
concrexit
website
thaliawebsite
settings
settings.py
Find file
Blame
History
Permalink
Merge branch 'master' into 'feature/einddatum_vacature'
· c7ccf3ef
Sébastiaan Versteeg
authored
Jul 19, 2017
# Conflicts: # website/thaliawebsite/settings/settings.py
c7ccf3ef
Sébastiaan Versteeg authored