diff options
| author | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
|---|---|---|
| committer | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
| commit | 4fbeb44718ca0f378baeae6fdda29388ff70b29d (patch) | |
| tree | 0b9008f684664753e7e7667b811e2246ff3e7312 /sublab_project/templates/base.html | |
| parent | 1347410c5125775f8b84bff0d12086158c39bea0 (diff) | |
| parent | 4d8b78ba8747804d0e090eae0674b22ba8f53198 (diff) | |
Merge branch 'master' of sublab.org:subweb
Conflicts:
sublab_project/news/templates/news/news_list.html
Diffstat (limited to 'sublab_project/templates/base.html')
| -rw-r--r-- | sublab_project/templates/base.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sublab_project/templates/base.html b/sublab_project/templates/base.html index 7499645..074dec9 100644 --- a/sublab_project/templates/base.html +++ b/sublab_project/templates/base.html @@ -17,6 +17,11 @@ <link rel="stylesheet" href="{{ STATIC_URL }}autogen/trieste.status.css" type="text/css"> <link rel="stylesheet" href="{{ STATIC_URL }}autogen/nautilus.status.css" type="text/css"> <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.png"> + + {% block feeds %} + <link rel="alternate" type="application/atom+xml" title="sublab.org News (atom)" href="{% url news_feed_atom %}"> + <link rel="alternate" type="application/rss+xml" title="sublab.org News (rss)" href="{% url news_feed %}"> + {% endblock feeds %} </head> <body> |