Changeset [07c3208c2ba458dd8b44fa6c76b73defb09d32f4] by Joshua Peek

October 4th, 2011 @ 07:10 AM

Merge branch 'master' into 2.1.x

Conflicts:

lib/sprockets/caching.rb

https://github.com/sstephenson/sprockets/commit/07c3208c2ba458dd8b4...

Committed by Joshua Peek

  • A test/fixtures/default/app/main.js
  • A test/fixtures/default/vendor/jquery.js
  • M lib/sprockets/asset.rb
  • M lib/sprockets/version.rb
  • M test/test_caching.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>