Permalink
Browse files

Merge branch 'master' into 2.1.x

Conflicts:
	lib/sprockets/asset_attributes.rb
	test/test_asset_attributes.rb
  • Loading branch information...
2 parents 4bc9c18 + 4ba5b32 commit f2ab440d0a55289a0acc2b9c952f44c28f6a0a6e @josh josh committed Oct 24, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit f2ab440

Please sign in to comment.