Ben Hollis 5f9dec3dc8 Merge remote-tracking branch 'origin/v3-stable' ... Conflicts: middleman-core/lib/middleman-core/core_extensions/rendering.rb middleman/middleman.gemspec		2014-05-15 23:41:04 -07:00
..
features	Streamline middleman wrapper gem [no-ci]	2012-04-26 15:28:18 -07:00
fixtures	bump bundler dep, try to track down JRuby 1.9 encoding weirdness	2012-06-05 16:48:58 -07:00
lib	Implemented Rubocop	2013-12-28 00:47:39 +00:00
spec	lose the empty files, keep the directory	2014-03-25 13:09:38 +00:00
.gemtest	enable gemtest at a per-gem level	2012-01-02 14:48:47 -08:00
.simplecov	consistency with other gems [ci skip]	2014-03-25 10:09:51 +00:00
.yardopts	consistency with other gems [ci skip]	2014-03-25 10:09:51 +00:00
middleman.gemspec	Merge remote-tracking branch 'origin/v3-stable'	2014-05-15 23:41:04 -07:00
Rakefile	whitespace [ci skip]	2014-03-25 13:13:36 +00:00