diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 15:56:12 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 15:56:12 -0500 |
| commit | ea04e4b3da76bbb74ec895a4995c6c2388146164 (patch) | |
| tree | 6f6c485e9e33dee918adc27fb988fc2273bac780 /templates/news/view.html | |
| parent | e92a9065c99e4ab1c8b98521f77a1ddd0e0dad9a (diff) | |
| parent | 09e7d2706e9b15da7d566c6156b68f96dab25320 (diff) | |
Merge commit '09e7d27' (tweaks to default local_settings)
Conflicts:
local_settings.py.example
Diffstat (limited to 'templates/news/view.html')
0 files changed, 0 insertions, 0 deletions