Merge branch '2.1' of github.com:imathis/octopress into 2.1

This commit is contained in:
Brandon Mathis 2012-05-21 23:57:07 -05:00
commit b52536d72c

View File

@ -46,7 +46,7 @@ module Jekyll
SITEMAP_FILE_NAME = "sitemap.xml"
# Any files to exclude from being included in the sitemap.xml
EXCLUDED_FILES = ["atom.xml, 404.html"]
EXCLUDED_FILES = ["atom.xml", "404.markdown"]
# Any files that include posts, so that when a new post is added, the last
# modified date of these pages should take that into account