diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
| commit | 03fa7e4f27bdb39a8f8f5ed91a87d18bf8357b47 (patch) | |
| tree | c67eafcbda55706f18400b3115a2b8a5be318394 /__init__.py | |
| parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
| parent | b8ee7b1ee281b45b245fb454228b8ad847c56200 (diff) | |
Merge branch 'archweb' into archweb-generic2
Conflicts:
devel/views.py
feeds.py
public/views.py
settings.py
sitestatic/archweb.js
templates/base.html
templates/devel/profile.html
templates/mirrors/status.html
templates/news/view.html
templates/packages/flaghelp.html
templates/packages/opensearch.xml
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/registration/login.html
templates/releng/results.html
templates/todolists/public_list.html
Diffstat (limited to '__init__.py')
0 files changed, 0 insertions, 0 deletions