Merge branch 'master' of github.com:thoughtbot/paperclip

3dd621d4 · Chad Pytel · 6f018763 · c1c14aa4 · 3dd621d4 · 6f018763
Commit 3dd621d4 authored Jun 15, 2011 by Chad Pytel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

init.rb
+3 -0

rails/init.rb
+0 -2

No files found.
--- a/init.rb
+++ b/init.rb
 require File.join(File.dirname(__FILE__), "lib", "paperclip")
+require 'paperclip/railtie'
+Paperclip::Railtie.insert
--- a/rails/init.rb
+++ b/rails/init.rb
-require 'paperclip/railtie'
-Paperclip::Railtie.insert