middleman/middleman-core
Ben Hollis c0c14f4eab Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/preview_server.rb
	middleman-core/lib/middleman-core/renderers/sass.rb
	middleman-core/lib/middleman-core/sitemap/store.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-more/lib/middleman-more/core_extensions/compass.rb
	middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-more/lib/middleman-more/extensions/asset_hash.rb
2013-01-25 21:43:30 -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-01-25 21:43:30 -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 make windows rack generic again 2013-01-09 10:28:47 -08:00
Rakefile The return of the windows gem, for wdm and speedier file watching support 2012-09-01 08:44:02 -07:00