History | View | Annotate | Download (1.9 kB)
Import settings not present in merged branch
Merge branch 'api-current' into helpdesk-gui
Conflicts: settings.py.dist
Split settings.py.dist in distinct conf files
Split settings.py.dist in distinct conf files under settings.d/,similarly to:
https://code.djangoproject.com/wiki/SplitSettings#UsingalistofconffilesTransifex
Use settings..d/*-local.conf files for local modifications,...