Changeset [bd1955562b5d9c75b7afa55c465a35155ae9ea6f] by Joshua Peek

November 2nd, 2011 @ 07:56 PM

Merge branch 'master' into 2.1.x

Conflicts:

lib/sprockets/asset_attributes.rb
lib/sprockets/environment.rb
lib/sprockets/index.rb

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

Committed by Joshua Peek

  • M test/test_environment.rb
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>