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
..
core_extensions	Merge remote-tracking branch 'origin/3.0-stable'	2013-01-25 21:43:30 -08:00
extensions	Merge remote-tracking branch 'origin/3.0-stable'	2013-01-25 21:43:30 -08:00
templates	Add README files for each directory	2012-09-11 11:01:55 -04:00