Changeset [9351d06456ab4c8156fcfeff02a6726b6a4fcd56] by Joshua Peek

September 30th, 2011 @ 08:11 PM

Merge branch 'master' into 2.1.x

Conflicts:

lib/sprockets/bundled_asset.rb

https://github.com/sstephenson/sprockets/commit/9351d06456ab4c8156f...

Committed by Joshua Peek

  • M lib/sprockets/version.rb
  • M sprockets.gemspec
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>