Ben Hollis c9a640a3e2 Merge remote-tracking branch 'origin/v3-stable' ... Conflicts: middleman-core/lib/middleman-core/extension.rb		2014-03-03 22:10:50 -08:00
..
middleman	Implemented Rubocop	2013-12-28 00:47:39 +00:00
middleman-core	Merge remote-tracking branch 'origin/v3-stable'	2014-03-03 22:10:50 -08:00
middleman-more	Fix Padrino integration after merge	2014-02-22 20:11:54 -08:00
vendored-middleman-deps	Merge remote-tracking branch 'origin/v3-stable'	2014-02-22 18:11:37 -08:00
middleman-core.rb	Implemented Rubocop	2013-12-28 00:47:39 +00:00