summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-17 06:23:36 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-12-17 06:23:36 +0000
commitdfb3bff1bd1edca48ca7fd998eee518e62a6a8d8 (patch)
treee5be8770280cb8e3a7842603ce0fc8f0aa4c647b
parentd0ec0508ad4f91d66abb03ab301c5e72ae3f9247 (diff)
downloadredmine-dfb3bff1bd1edca48ca7fd998eee518e62a6a8d8.tar.gz
redmine-dfb3bff1bd1edca48ca7fd998eee518e62a6a8d8.zip
Merged r17116 from trunk to 3.4-stable (#27691)
Gemfile: relax mail gem version. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17117 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 13d51f292..f2c01a6fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,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.8.1" : "~> 1.6.8")
gem "i18n", "~> 0.7.0"