From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 17 Dec 2017 06:26:17 +0000 (+0000)
Subject: Merged r17116 from trunk to 3.2-stable (#27691)
X-Git-Tag: 3.2.9~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c54068f2dc883081105cfc702f748ac320de42b2;p=redmine.git

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 61487b0be..6608672fa 100644
--- 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"