Ben Hollis 4745418200 Merge remote-tracking branch 'origin/3.0-stable' ... Conflicts: .travis.yml Gemfile middleman-core/lib/middleman-core/version.rb middleman-core/middleman-core-x86-mingw32.gemspec middleman-core/middleman-core.gemspec		2013-03-02 22:32:03 -08:00
..
bin	Stop messing with load path in middleman executable	2012-09-15 18:45:14 -07:00
features	Merge remote-tracking branch 'origin/3.0-stable'	2013-01-25 21:43:30 -08:00
fixtures	Merge remote-tracking branch 'origin/3.0-stable'	2013-01-25 21:43:30 -08:00
lib	Merge remote-tracking branch 'origin/3.0-stable'	2013-03-02 22:32:03 -08:00
spec	Fix binary_spec test for svgz - it's binary	2013-02-10 16:53:38 -08:00
.cane	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
.cane-exclusions.yml	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
.gemtest	enable gemtest at a per-gem level	2012-01-02 14:48:47 -08:00
middleman-core.gemspec	latest listen supports new wdm	2013-02-24 13:34:07 -08:00
Rakefile	The return of the windows gem, for wdm and speedier file watching support	2012-09-01 08:44:02 -07:00