summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-17 06:26:17 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-17 06:26:17 +0000
commitc54068f2dc883081105cfc702f748ac320de42b2 (patch)
tree9faf7dae939c4b1d7a4e2ab55a97b0ce2dd601b1 /Gemfile
parent02a2ca8c0446ccad9cd569df8344b4c88450b062 (diff)
downloadredmine-c54068f2dc883081105cfc702f748ac320de42b2.tar.gz
redmine-c54068f2dc883081105cfc702f748ac320de42b2.zip
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
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"