summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-17 06:25:03 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-17 06:25:03 +0000
commit75223ceb3d00b9b7ae9a4fa4403018bee86b1723 (patch)
tree49f9e0cf92b1a4efb77ea3b1224aca9d948ab01f
parent515315028d08b8a7a6f935153adbcf517dbccb20 (diff)
downloadredmine-75223ceb3d00b9b7ae9a4fa4403018bee86b1723.tar.gz
redmine-75223ceb3d00b9b7ae9a4fa4403018bee86b1723.zip
Merged r17116 from trunk to 3.3-stable (#27691)
Gemfile: relax mail gem version. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17118 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7201ef794..f09863fed 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"