Files · 7cd7c1ba27241300fe5dca3f7cfc1dcca03e5e8d · ikcrm_common / paperclip · GitLab

History Find file

Merge branch 'master' of git://github.com/bjhess/paperclip into bjhess · 7cd7c1ba
```
Conflicts:

	lib/paperclip/attachment.rb
	lib/paperclip/thumbnail.rb
```
Jon Yurek committed Sep 12, 2008
7cd7c1ba

Name	Last commit	Last Update
generators/paperclip		Loading commit data...
lib		Loading commit data...
shoulda_macros		Loading commit data...
tasks		Loading commit data...
test		Loading commit data...
.gitignore		Loading commit data...
LICENSE		Loading commit data...
README.rdoc		Loading commit data...
Rakefile		Loading commit data...
init.rb		Loading commit data...

README.rdoc