Ben Hollis 7108c29035 Merge remote-tracking branch 'origin/v3-stable' ... Conflicts: CHANGELOG.md middleman-core/lib/middleman-core/core_extensions/rendering.rb middleman-core/lib/middleman-core/version.rb		2014-05-26 16:59:04 -07:00
..
features	Removed wrap_layout	2014-05-25 12:23:00 +09:00
fixtures	Removed wrap_layout	2014-05-25 12:23:00 +09:00
lib	Make rubocop TrivialAccessors warnings less annoying	2014-05-26 16:53:23 -07:00
spec	update rspec should syntax to expect	2014-05-15 11:51:42 -04: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	Improve documentation for Middleman::Extension	2014-05-11 00:35:15 -07:00
middleman-core.gemspec	merge activesupport update	2014-04-09 16:14:10 -07:00
Rakefile	whitespace [ci skip]	2014-03-25 13:13:36 +00:00