Merge branch 'master' into gh-pages

This commit is contained in:
Michael Rose 2013-06-04 14:21:16 -04:00
commit 13d79adf9a

View file

@ -2,7 +2,7 @@ title: Minimal Mistakes
tagline: Jekyll Theme tagline: Jekyll Theme
description: A responsive Jekyll theme with editorial design tendencies. description: A responsive Jekyll theme with editorial design tendencies.
#Comment out url when working locally to resolve base urls correctly #Comment out url when working locally to resolve base urls correctly
#url: http://mmistakes.github.io/minimal-mistakes url: http://mmistakes.github.io/minimal-mistakes
# Owner/author information goes here. # Owner/author information goes here.
owner: owner: