diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
| commit | c6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (patch) | |
| tree | 138b206e95b7ec98ad9d319dd95157a2028b4cd1 /main/templatetags | |
| parent | 81a4f3e5e602d900ebfb2c20eb7565fddfb013a2 (diff) | |
| parent | c910b9220c45eb9d493d260f325efda2141205a4 (diff) | |
Merge branch 'archweb-generic' into master-nomake
# Conflicts:
# public/views.py
Diffstat (limited to 'main/templatetags')
| -rw-r--r-- | main/templatetags/pgp.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index cc080439..2417f688 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -44,7 +44,7 @@ def pgp_key_link(key_id, link_text=None): return '<a href="%s" title="PGP key search for %s">%s</a>' % values -@cache_function(1800) +@cache_function(1741) def name_for_key(normalized): try: matching_key = DeveloperKey.objects.select_related( |