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
..
middleman	Implemented Rubocop	2013-12-28 00:47:39 +00:00
middleman-core	Merge remote-tracking branch 'origin/v3-stable'	2014-05-15 23:41:04 -07:00
vendored-middleman-deps	Unvendor padrino	2014-04-04 10:22:34 -07:00
middleman-core.rb	Rubocop'd	2014-04-29 11:43:05 -07:00