summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-14 16:08:04 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-14 16:08:04 -0500
commit87520a593377858f2aa53d7f297dfc52f6fe397f (patch)
treee1183fdd927301a23071b71b1b032528b9b043d5 /settings.py
parent3fe4b2189cd4c9741eebc0fa6ac131a5663be535 (diff)
parent96fecb1079a1ad4a2b574616bc6611678fa53dc8 (diff)
Merge commit '96fecb1' (Multilib differences report)
Conflicts: packages/views/__init__.py templates/packages/differences.html
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions