diff options
author | Dan McGee <dan@archlinux.org> | 2013-02-26 18:45:14 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2013-02-26 18:45:14 -0600 |
commit | f85cc0482a44ced9aed372b8972d31040ed4043b (patch) | |
tree | f0790247018bfa5c243fff623f917d7a7a8bf0cf /templates/public/keys.html | |
parent | 1457f78594a25f8cfb8ad1f9b3cd6d071a3d6a93 (diff) | |
parent | a25cc4ff459ab0070ce48730f6c6fdc227860f08 (diff) |
Merge branch 'django-1.5'
Conflicts:
requirements.txt
requirements_prod.txt
Diffstat (limited to 'templates/public/keys.html')
-rw-r--r-- | templates/public/keys.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/public/keys.html b/templates/public/keys.html index ad2dd19d..91b53075 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% load url from future %} {% load pgp %} {% block title %}Arch Linux - Master Signing Keys{% endblock %} |