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 /notmyidea-cms/templates/base.html | |
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 'notmyidea-cms/templates/base.html')
-rw-r--r-- | notmyidea-cms/templates/base.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notmyidea-cms/templates/base.html b/notmyidea-cms/templates/base.html index 387125b..a782e50 100644 --- a/notmyidea-cms/templates/base.html +++ b/notmyidea-cms/templates/base.html @@ -68,7 +68,7 @@ <div class="widget social"> <h2>Social</h2> <ul> - <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li> + <li><a href="{{ SITEURL }}/{{ FEED_ALL_ATOM }}" rel="alternate">atom feed</a></li> {% if FEED_RSS %} <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li> {% endif %} |