diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-26 09:59:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-26 09:59:34 -0400 |
| commit | 5bfa5b7eee551c14ecee616f1830dc4603497311 (patch) | |
| tree | 53917036e3a7b515c6c794aa7d1c127d61c15508 /public | |
| parent | 9d3cb6e783603d4991f7e610912ba5665fd43260 (diff) | |
| parent | 55b776d58999412cd6bf0787a41d6ab00bf80fb6 (diff) | |
Merge branch 'archweb-generic2'
Conflicts:
main/fixtures/arches.json
settings.py
templates/public/index.html
templates/public/svn.html
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions