diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-18 13:40:28 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-18 13:40:28 +0200 |
| commit | e9816cb2d3ddc4530303a532210cc12782922c83 (patch) | |
| tree | 70af59e9247ecda036f585343f85f9086430f426 /ishtar_common/templates/ishtar/merge.html | |
| parent | b761775288d21112b18f60bf91fef083458b57fe (diff) | |
| download | Ishtar-e9816cb2d3ddc4530303a532210cc12782922c83.tar.bz2 Ishtar-e9816cb2d3ddc4530303a532210cc12782922c83.zip | |
Django 1.8: removing "load url from future" we are in the future
Diffstat (limited to 'ishtar_common/templates/ishtar/merge.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/merge.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html index 0e15da62a..de46e95c6 100644 --- a/ishtar_common/templates/ishtar/merge.html +++ b/ishtar_common/templates/ishtar/merge.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% load i18n inline_formset %} {% block content %} <h2>{% trans "Merge" %}</h2> |