Changeset [71999d613145c733ffdd9803e8bd8dbed1aef682] by Joshua Peek

June 16th, 2011 @ 06:02 AM

Merge branch 'master' into shared-cache

Conflicts:

lib/sprockets.rb

https://github.com/sstephenson/sprockets/commit/71999d613145c733ffd...

Committed by Joshua Peek

  • A lib/sprockets/processor.rb
  • R lib/sprockets/compressor.rb
  • M lib/sprockets.rb
  • M lib/sprockets/processing.rb
  • M test/test_context.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>