Fix bad merge
[cascardo/ema.git] / settings.py.dist
2008-10-23 Marcelo Jorge Viei... Added ema.contents in INSTALLED_APPS
2008-07-02 Lincoln de Sousamoving settings.py to settings.py.dist to avoid