Fix bad merge
[cascardo/ema.git] / settings.py
2008-07-02 Lincoln de Sousamoving settings.py to settings.py.dist to avoid
2008-07-01 Lincoln de SousaAdding diario stuff to this project
2008-06-30 Lincoln de SousaStarting the ema project