Browse files

Merge branch 'master' into 2.1.x

Conflicts:
	lib/sprockets/caching.rb
  • Loading branch information...
2 parents 07c3208 + 9483f5d commit b5817f68a345a098dbe60566fd71384c70d4e694 @josh josh committed Oct 5, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/sprockets/caching.rb
View
2 lib/sprockets/caching.rb
@@ -20,7 +20,7 @@ def cache_asset(path)
hash = {}
asset.encode_with(hash)
- # Save the asset to at its path
+ # Save the asset to its path
cache_set_hash(path.to_s, hash)
# Since path maybe a logical or full pathname, save the

0 comments on commit b5817f6

Please sign in to comment.