Changeset [f1b9b987d426eeee956f163e471bef26c5eb7af2] by Ken Robertson
Revision f1b9b987d426eeee956f163e471bef26c5eb7af2,
committed by Ken Robertson
· May 12th, 2011 @ 11:07 AM
Merge branch 'master' of https://github.com/ProtectedMethod/scribd_fu
Conflicts:
lib/scribd_fu.rb
lib/scribd_fu/paperclip.rb
https://github.com/ProtectedMethod/scribd_fu/commit/f1b9b987d426eee...
5 changed files
-
M
VERSION -
M
lib/scribd_fu.rb -
M
lib/scribd_fu/paperclip.rb -
M
scribd_fu.gemspec -
M
spec/scribd_fu_spec.rb