Merge branch 'master' into develop

This commit is contained in:
Michael Rose 2013-07-18 11:30:40 -04:00
commit 0f4275ee94

View file

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