summaryrefslogtreecommitdiff
path: root/templates/devel/clock.html
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:55:53 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:55:53 -0500
commitb2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch)
tree2355b55efce971b6c7044b1f04b4a3730d2da50f /templates/devel/clock.html
parent0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff)
parentfab8d437929fce202b11707e1cacbc079f61edbc (diff)
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes Conflicts: templates/news/list.html templates/public/index.html
Diffstat (limited to 'templates/devel/clock.html')
-rw-r--r--templates/devel/clock.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 8970fad0..6dc7defd 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load cycle from future %}
{% load static from staticfiles %}
{% load flags %}
{% load tz %}