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
..
features	Streamline middleman wrapper gem [no-ci]	2012-04-26 15:28:18 -07:00
fixtures	bump bundler dep, try to track down JRuby 1.9 encoding weirdness	2012-06-05 16:48:58 -07:00
lib	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
spec	Stub out rspec tests for public APIs: Rack and Sitemap for now	2012-10-27 11:47:06 -07:00
.gemtest	enable gemtest at a per-gem level	2012-01-02 14:48:47 -08:00
middleman.gemspec	bump required sprockets	2013-01-03 13:08:19 -08:00
Rakefile	Streamline middleman wrapper gem [no-ci]	2012-04-26 15:28:18 -07:00