Merge remote-tracking branch 'upstream/pull/2937' into master

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

diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 18df05cf2c4f6ffb1be0c7e794cb7b7c4eb606b1..576da5285f51cbcd400145e7718dd0f10c3b0835 100644 (file)
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,3 +1,6 @@
-# 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 "application/x-amf", :amf
 Mime::Type.register "application/gpx+xml", :gpx