Merge branch 'sh-bump-mail-gem' into 'master'

Update mail gem to 2.6.5 See merge request !10951

Merge branch 'sh-bump-mail-gem' into 'master'
ff400194 · Robert Speicher · 5c195199 · 80dc0039 · ff400194
Commit ff400194 authored Apr 27, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -429,7 +429,7 @@ GEM
      multi_json (~> 1.10)
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
      mime-types (>= 1.16, < 4)
    mail_room (0.9.1)
    memoist (0.15.0)