deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
middleman/middleman-core
History
Ben Hollis 60f712e6ba Merge branch 'v3-stable' 
Conflicts:
	.travis.yml
	Gemfile
	middleman-cli/lib/middleman-cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
	middleman-core/lib/middleman-core/templates.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
..
features Remove static serving of non-Middleman folders 2014-03-25 16:57:57 -07:00
fixtures Remove static serving of non-Middleman folders 2014-03-25 16:57:57 -07:00
lib Merge branch 'v3-stable' 2014-03-25 22:35:19 -07:00
spec Move to flat_map now that we don't use 1.8 2013-11-18 22:22:18 -08:00
.gemtest enable gemtest at a per-gem level 2012-01-02 14:48:47 -08:00
.simplecov ignore vendor in simplecov 2013-06-04 14:28:46 -07:00
.yardopts Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
middleman-core.gemspec more consistency across all gems 2014-03-25 08:50:28 +00:00
Rakefile whitespace [ci skip] 2014-03-25 13:13:36 +00:00