diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
| commit | dbb508b7222081b523ce3e0bd2b69f5fea6c7050 (patch) | |
| tree | f5f3a97b9465504ed9e7633a0c385669b7463d3c /templates/devel/clock.html | |
| parent | fd788c5fcf9009540ad14a869dcebdfd30fb9d6f (diff) | |
| parent | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (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.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 5b2e358b..6ed890c1 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 %} |