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 | |
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')
-rw-r--r-- | templates/devel/clock.html | 1 | ||||
-rw-r--r-- | templates/devel/index.html | 1 | ||||
-rw-r--r-- | templates/devel/packages.html | 1 | ||||
-rw-r--r-- | templates/devel/stats.html | 1 |
4 files changed, 4 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 %} diff --git a/templates/devel/index.html b/templates/devel/index.html index 919314c8..b6287110 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load cycle from future %} {% load static from staticfiles %} {% load cache %} {% load package_extras %} diff --git a/templates/devel/packages.html b/templates/devel/packages.html index 51e98579..a67553bb 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load cycle from future %} {% load static from staticfiles %} {% load attributes %} {% load package_extras %} diff --git a/templates/devel/stats.html b/templates/devel/stats.html index 2dbe4755..9b3b1d28 100644 --- a/templates/devel/stats.html +++ b/templates/devel/stats.html @@ -1,3 +1,4 @@ +{% load cycle from future %} {% load cache %} {% cache 60 dev-dash-by-arch %} |