summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-04-16 01:19:24 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-04-16 01:19:24 -0400
commitf86095bab5e5af6a2bf8be8ebe46d445864b4b71 (patch)
treefd1cfa3f7488190214e415d977a3af0e84177822 /public
parent7aabbe788bb4e26ee9c7cfc0e18692b487e11099 (diff)
parent7da44456fd05f2ac74355825de7100e46e86449b (diff)
Merge branch 'archweb-generic'
Diffstat (limited to 'public')
-rw-r--r--public/views.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/public/views.py b/public/views.py
index 088ee4de..af0c1ff6 100644
--- a/public/views.py
+++ b/public/views.py
@@ -118,8 +118,6 @@ def keys_json(request):
users = User.objects.filter(
is_active=True, userprofile__id__in=profile_ids).select_related(
'userprofile__pgp_key').order_by('first_name', 'last_name')
-
- users = User.objects.filter(is_active=True).select_related('userprofile')
node_list = [{
'name': user.get_full_name(),
'key': user.userprofile.pgp_key,