diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-08 18:13:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-08 18:13:35 +0200 |
| commit | 695d6c0f403f6970047c19c804e39391b9763271 (patch) | |
| tree | 2cba33588e42ec214b3d30b4825e36e7c4e47b40 /ishtar_common/templates/index.html | |
| parent | 339df04ebd6047f1c41491db8c9e284afa43d2ad (diff) | |
| parent | 49c9f8e285a9d75e08207ee697a81ac09c88a947 (diff) | |
| download | Ishtar-695d6c0f403f6970047c19c804e39391b9763271.tar.bz2 Ishtar-695d6c0f403f6970047c19c804e39391b9763271.zip | |
Merge branch 'master-warehouse'
Diffstat (limited to 'ishtar_common/templates/index.html')
| -rw-r--r-- | ishtar_common/templates/index.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ishtar_common/templates/index.html b/ishtar_common/templates/index.html index c4c0b0f2a..2b6d7004e 100644 --- a/ishtar_common/templates/index.html +++ b/ishtar_common/templates/index.html @@ -1,2 +1,3 @@ {% extends "base.html" %} {% load i18n %} +{% block content %}<div id='welcome'>{% if homepage %}{{homepage|safe}}{% else %}{% include "welcome.html" %}{% endif %}</div>{% endblock %} |