1
0
Fork 0
mirror of https://github.com/middleman/middleman.git synced 2022-11-09 12:20:27 -05:00
middleman--middleman/middleman-core/lib/vendored-middleman-deps
Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -08:00
..
padrino-core-0.12.0 Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
padrino-helpers-0.12.0 update padrino. 2014-02-18 18:30:29 -08:00
fastimage.rb move vendored gems into shared root 2013-05-23 16:06:20 -07:00