Merge pull request #336 from chezka/master

Change plugin initialization to rails3 style

Merge pull request #336 from chezka/master
Change plugin initialization to rails3 style
1de1de76 · Chad Pytel · cbba34c2 · fb3a42cd · 1de1de76 · cbba34c2
Commit 1de1de76 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