attachment_test.rb
11.8 KB
-
Merge branch 'master' of git://github.com/bjhess/paperclip into bjhess · 7cd7c1baConflicts: lib/paperclip/attachment.rb lib/paperclip/thumbnail.rb
Jon Yurek committed
Conflicts: lib/paperclip/attachment.rb lib/paperclip/thumbnail.rb