Changeset [0e3d05a7232618387a2854d649433d7ac4a1d163] by Joshua Peek

June 16th, 2011 @ 04:36 AM

Merge branch 'master' into shared-cache

Conflicts:

lib/sprockets/static_asset.rb
lib/sprockets/static_compilation.rb

https://github.com/sstephenson/sprockets/commit/0e3d05a7232618387a2...

Committed by Joshua Peek

  • M lib/sprockets/bundled_asset.rb
  • M lib/sprockets/static_asset.rb
  • M lib/sprockets/static_compilation.rb
  • M test/test_asset.rb
  • 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>