Changeset [c103b99be91a600fe3e503bf5c26fd00f0d4f21b] by Joshua Peek

May 14th, 2011 @ 09:07 AM

Merge branch 'master' into debug-assets

Conflicts:

lib/sprockets/directive_processor.rb

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

Committed by Joshua Peek

  • A test/fixtures/asset/circle/a.js
  • A test/fixtures/asset/circle/b.js
  • A test/fixtures/asset/circle/c.js
  • A test/fixtures/asset/require_self_twice.css
  • M lib/sprockets/directive_processor.rb
  • M test/test_asset.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>