diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-07-24 18:37:52 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-07-24 18:37:52 +0200 |
commit | ed852141c9abd931bec2e9b867aca7de1611a868 (patch) | |
tree | 4897c9114a7d881ee9ce18504e27c55ddcd6460b /template/news.html.j2.inc | |
parent | 0a379ece9ffd400b08854e8e9eef334601f680e6 (diff) | |
parent | f7b54c1d0da6727aab60f7406f456eb0fe3ebc56 (diff) | |
download | www-ed852141c9abd931bec2e9b867aca7de1611a868.tar.gz www-ed852141c9abd931bec2e9b867aca7de1611a868.zip |
Merge branch 'master' into stable
Diffstat (limited to 'template/news.html.j2.inc')
-rw-r--r-- | template/news.html.j2.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/template/news.html.j2.inc b/template/news.html.j2.inc index c927ded1..8c3054c2 100644 --- a/template/news.html.j2.inc +++ b/template/news.html.j2.inc | |||
@@ -1,3 +1,5 @@ | |||
1 | {% include "news/2019-0.11.6.inc" %} | ||
2 | {% include "news/2019-07-GHM_Aug_2019.inc" %} | ||
1 | {% include "news/2019-06-DSTJ.inc" %} | 3 | {% include "news/2019-06-DSTJ.inc" %} |
2 | {% include "news/2019-06.inc" %} | 4 | {% include "news/2019-06.inc" %} |
3 | {% include "news/2019-0.11.5.inc" %} | 5 | {% include "news/2019-0.11.5.inc" %} |
@@ -7,5 +9,4 @@ | |||
7 | {% include "news/2019-0.11.1.inc" %} | 9 | {% include "news/2019-0.11.1.inc" %} |
8 | {% include "news/2019-0.11.0.inc" %} | 10 | {% include "news/2019-0.11.0.inc" %} |
9 | {% include "news/2019-02.inc" %} | 11 | {% include "news/2019-02.inc" %} |
10 | {% include "news/2018-07.inc" %} | ||
11 | <a href="old-news.html"><h3>{{ _("More news")}}</h3></a> | 12 | <a href="old-news.html"><h3>{{ _("More news")}}</h3></a> |