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
..
features	Merge remote-tracking branch 'origin/3.0-stable'	2013-03-02 22:32:03 -08:00
fixtures	Support Haml 4. Tests only run with Haml 4 now. Fixes #783	2013-02-17 19:40:17 -08:00
lib	Merge remote-tracking branch 'origin/3.0-stable'	2013-02-10 18:05:24 -08:00
spec	Stub out rspec tests for public APIs: Rack and Sitemap for now	2013-02-09 15:32:32 -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-more.gemspec	Merge remote-tracking branch 'origin/3.0-stable'	2013-03-02 22:32:03 -08:00
Rakefile	setup rakefile for windows build	2012-01-05 20:34:24 -08:00