deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0-stable'

Browse source 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/data.rb
	middleman-core/lib/middleman-core/core_extensions/front_matter.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core-x86-mingw32.gemspec
	middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-more/lib/middleman-more/core_extensions/i18n.rb
This commit is contained in:
Ben Hollis 2013-02-10 15:41:36 -08:00
commit 52c4677391
28 changed files with 440 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/preview_server.rb
View file

@ -194,7 +194,7 @@ module Middleman
paths.any? do |path|
match_against.any? do |matcher|
path.match(matcher)
path =~ matcher
end
end
end