Changeset [f2ab440d0a55289a0acc2b9c952f44c28f6a0a6e] by Joshua Peek

October 24th, 2011 @ 04:01 PM

Merge branch 'master' into 2.1.x

Conflicts:

lib/sprockets/asset_attributes.rb
test/test_asset_attributes.rb

https://github.com/sstephenson/sprockets/commit/f2ab440d0a55289a0ac...

Committed by Joshua Peek

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

JavaScript dependency management and concatenation
<a href="http://getsprockets.org/">http://getsprockets.org/</a>