Ben Hollis 60f712e6ba Merge branch 'v3-stable' ... Conflicts: .travis.yml Gemfile middleman-cli/lib/middleman-cli/build.rb middleman-core/lib/middleman-core/core_extensions/file_watcher.rb middleman-core/lib/middleman-core/templates.rb middleman-core/lib/middleman-core/util.rb middleman-core/middleman-core.gemspec		2014-03-25 22:35:19 -07:00
..
middleman	Implemented Rubocop	2013-12-28 00:47:39 +00:00
middleman-core	Merge branch 'v3-stable'	2014-03-25 22:35:19 -07: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