Merge branch 'master' into develop

# By Michael Rose (1) and Tyler Rhodes (1)
* master:
  Undo merged pull request 15d6754bef
  Add 'vendor' to excludes.
This commit is contained in:
Michael Rose 2013-07-17 22:42:18 -04:00
commit 46b2d46edd

View file

@ -64,4 +64,4 @@ kramdown:
coderay_css: class
include: [".htaccess"]
exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "so-simple-theme.sublime-project", "so-simple-theme.sublime-workspace"]
exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace"]