deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
middleman/middleman-core/lib
History
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
..
middleman Clean up whitespace, play with cane for testing style quality and code complexity 2012-08-13 15:41:07 -07:00
middleman-core Merge remote-tracking branch 'origin/3.0-stable' 2013-01-25 21:43:30 -08:00
middleman-core.rb Clean up whitespace, play with cane for testing style quality and code complexity 2012-08-13 15:41:07 -07:00