Ben Hollis d7fd48ef7d Merge branch 'v3-stable' ... Conflicts: middleman-core/lib/middleman-more/extensions/asset_hash.rb		2014-06-28 18:48:49 -07:00
..
middleman	Implemented Rubocop	2013-12-28 00:47:39 +00:00
middleman-core	Merge branch 'v3-stable'	2014-06-28 18:48:49 -07:00
middleman-core.rb	Rubocop'd	2014-04-29 11:43:05 -07:00