Merged r17116 from trunk to 3.2-stable (#27691)

Gemfile: relax mail gem version.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17119 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 61487b0becd65b3be926742adec23a0bada49293..6608672faa493bf9039e9fcdc82de1e5f1d328ba 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "actionpack-xml_parser"
 gem "roadie-rails", "~> 1.1.1"
 gem "roadie", "~> 3.2.1"
 gem "mimemagic"
-gem "mail", "~> 2.6.6"
+gem "mail", "~> 2.6.4"
 
 gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
 gem "i18n", "~> 0.7.0"