diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2010-12-31 15:42:55 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2010-12-31 15:42:55 -0300 |
| commit | c9178286885d60741eb0e696c3e345e3b0dfb9e2 (patch) | |
| tree | 7738211d84337e897acfd2263be0b33352becae0 /settings.py | |
| parent | ebcd492d39cd0525b768a48558e50041aa0961e3 (diff) | |
| parent | 84897adcdc698678f2ee8d2292cfe4271c6335e4 (diff) | |
Merge git://projects.archlinux.org/archweb
Conflicts:
templates/public/index.html
urls.py
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions