Merge branch 'master' into notes

[rails.git] / config / initializers / mime_types.rb

diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 18df05cf2c4f6ffb1be0c7e794cb7b7c4eb606b1..be247274f290811f0ccf61b7dee2b6a488343bc9 100644 (file)
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,3 +1,7 @@
-# Add new mime types for use in respond_to blocks:
+# Be sure to restart your server when you modify this file.
 
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
+Mime::Type.register "application/x-amf", :amf
 Mime::Type.register "application/gpx+xml", :gpx