diff config/initializers/20-mime_types.rb @ 1338:25603efa57b5

Merge from live branch
author Chris Cannam
date Thu, 20 Jun 2013 13:14:14 +0100
parents 433d4f72a19b
children
line wrap: on
line diff
--- a/config/initializers/20-mime_types.rb	Wed Jan 23 13:11:25 2013 +0000
+++ b/config/initializers/20-mime_types.rb	Thu Jun 20 13:14:14 2013 +0100
@@ -1,5 +1,4 @@
 # Add new mime types for use in respond_to blocks:
 
 Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
-Mime::Type.register 'application/pdf', :pdf
-Mime::Type.register 'image/png', :png
+