Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 13 insertions, 0 deletions

diff --git a/new-bootstrap2/templates/archives.html b/new-bootstrap2/templates/archives.html
new file mode 100644
index 0000000..83976a1
--- /dev/null
+++ b/new-bootstrap2/templates/archives.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block content %}
+<section id="content">
+<h1>Archives for {{ SITENAME }}</h1>
+
+<dl>
+{% for article in dates %}
+	<dt>{{ article.locale_date }}</dt>
+	<dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+</section>
+{% endblock %}