lib/paperclip.rb in paperclip-4.0.0 vs lib/paperclip.rb in paperclip-4.1.0

@@ -75,15 +75,16 @@
   # * command_path: Defines the path at which to find the command line
   #   programs if they are not visible to Rails the system's search path. Defaults to
   #   nil, which uses the first executable found in the user's search path.
   def self.options
     @options ||= {
-      :whiny             => true,
+      :whiny => true,
       :image_magick_path => nil,
-      :command_path      => nil,
-      :log               => true,
-      :log_command       => true,
-      :swallow_stderr    => true
+      :command_path => nil,
+      :log => true,
+      :log_command => true,
+      :swallow_stderr => true,
+      :content_type_mappings => {}
     }
   end
 
   def self.io_adapters=(new_registry)
     @io_adapters = new_registry