Merge branch 'master' of github.com:middleman/middleman

This commit is contained in:
Thomas Reynolds 2013-07-02 14:42:54 -07:00
commit dd2525c18e
3 changed files with 2 additions and 1 deletions

View file

@ -33,7 +33,7 @@ module Middleman
# Files starting with an dot, but not .htaccess
:source_dotfiles => proc { |file|
file =~ %r{/\.} && file !~ %r{/\.ht(access|passwd)}
file =~ %r{/\.} && file !~ %r{/\.(htaccess|htpasswd|nojekyll)}
},
# Files starting with an underscore, but not a double-underscore