Statistics
| Branch: | Tag: | Revision:

root / settings.d / 00-admins.conf @ f4fe8796

History | View | Annotate | Download (1.9 kB)

# Date Author Comment
f920d60e 06/28/2011 11:05 am Giorgos Gousios

Import settings not present in merged branch

0bc9e367 06/28/2011 10:27 am Giorgos Gousios

Merge branch 'api-current' into helpdesk-gui

Conflicts:
settings.py.dist

1277fb19 06/27/2011 04:40 pm Vangelis Koukis

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,...