diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 00:56:51 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 00:56:51 -0500 |
commit | 69f579f10bd7a9c2f75fe1f45e15ab30abed289d (patch) | |
tree | 6a0156650e95fbd13740d7d89eb9d5eafe209e45 /main/templatetags | |
parent | f4c1673124ec4490ca34180eadeb1edcc7b7fe92 (diff) | |
parent | 33fe337d087126c6869b21791ff8e3ad6fe9e196 (diff) |
Merge commit '33fe337' (Encourage bug reports to have a summary)
Conflicts:
packages/templatetags/package_extras.py
Diffstat (limited to 'main/templatetags')
0 files changed, 0 insertions, 0 deletions