lib · 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 16 years ago
7cd7c1ba

Name	Last commit	Last Update
..
paperclip		Loading commit data...
paperclip.rb		Loading commit data...