app/uploaders/asset_uploader.rb in locomotive_cms-0.0.4 vs app/uploaders/asset_uploader.rb in locomotive_cms-1.0.0.beta

@@ -58,10 +58,10 @@
     end
   end
 
   def self.content_types
     {
-      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'],
+      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg', 'image/x-icon'],
       :video      => [/^video/, 'application/x-shockwave-flash', 'application/x-swf'],
       :audio      => [/^audio/, 'application/ogg', 'application/x-mp3'],
       :pdf        => ['application/pdf', 'application/x-pdf'],
       :stylesheet => ['text/css'],
       :javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript'],