Merge remote branch 'public2/master' into hw2_start

[slick.rotten.hw2.git] / config / initializers / mime_types.rb

# 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