diff options
| author | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
|---|---|---|
| committer | Peter Fraenkel <pnf@podsnap.com> | 2014-08-21 12:53:41 -0400 |
| commit | cfa5f40283668540cda45794200809640f251acd (patch) | |
| tree | cf2bd8ffbea3ed4c01b5690ffd8ae2702976b583 /tuxlite_zf | |
| parent | 1cd742a84a81f135234be021cf4fe7b8ff2c13ff (diff) | |
| parent | a928687830876af8c919606bae47195af65bc82d (diff) | |
| download | pelican-themes-cfa5f40283668540cda45794200809640f251acd.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Keep the latex and tag-specific feeds in bootstrap3
Conflicts:
pelican-bootstrap3/templates/base.html
Diffstat (limited to 'tuxlite_zf')
| -rw-r--r-- | tuxlite_zf/README.md | 2 | ||||
| -rw-r--r-- | tuxlite_zf/templates/base.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tuxlite_zf/README.md b/tuxlite_zf/README.md index 4eb1971..a260ba8 100644 --- a/tuxlite_zf/README.md +++ b/tuxlite_zf/README.md @@ -10,4 +10,4 @@ Menu items and pages can be added to the top navigation bar via pelican settings Screenshot below.
-
+
diff --git a/tuxlite_zf/templates/base.html b/tuxlite_zf/templates/base.html index fc4072e..779c56d 100644 --- a/tuxlite_zf/templates/base.html +++ b/tuxlite_zf/templates/base.html @@ -110,4 +110,5 @@ </div>
</div>
</div>
+{% include "analytics.html" %}
</footer>
|