annotate config/initializers/20-mime_types.rb @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents 433d4f72a19b
children
rev   line source
Chris@0 1 # Add new mime types for use in respond_to blocks:
Chris@0 2
Chris@0 3 Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
Chris@1115 4