Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 9 insertions, 0 deletions

diff --git a/simple-bootstrap/templates/page.html b/simple-bootstrap/templates/page.html
new file mode 100755
index 0000000..3a0dc4a
--- /dev/null
+++ b/simple-bootstrap/templates/page.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{%endblock%}
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    {% import 'translations.html' as translations with context %}
+    {{ translations.translations_for(page) }}
+
+    {{ page.content }}
+{% endblock %}