Ben Hollis bb2f40cc72 Merge branch '3.0-stable' ... Conflicts: README.md		2013-02-05 22:07:05 -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 branch '3.0-stable'	2013-02-05 22:07:05 -08:00
spec	Stub out rspec tests for public APIs: Rack and Sitemap for now	2012-10-27 11:47:06 -07: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	Merge remote-tracking branch 'origin/3.0-stable'	2013-01-26 01:01:01 -08:00
Rakefile	The return of the windows gem, for wdm and speedier file watching support	2012-09-01 08:44:02 -07:00