Commit de3b7d9c authored by Robert Speicher's avatar Robert Speicher

Merge branch 'update-mail-room' into 'master'

Update mail_room

See merge request !1213
parents ef0149dd bc683a59
...@@ -273,6 +273,6 @@ gem "newrelic_rpm" ...@@ -273,6 +273,6 @@ gem "newrelic_rpm"
gem 'octokit', '3.7.0' gem 'octokit', '3.7.0'
gem "mail_room", "~> 0.4.0" gem "mail_room", "~> 0.4.1"
gem 'email_reply_parser' gem 'email_reply_parser'
...@@ -372,7 +372,7 @@ GEM ...@@ -372,7 +372,7 @@ GEM
systemu (~> 2.6.2) systemu (~> 2.6.2)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
mail_room (0.4.0) mail_room (0.4.1)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mimemagic (0.3.0) mimemagic (0.3.0)
...@@ -808,7 +808,7 @@ DEPENDENCIES ...@@ -808,7 +808,7 @@ DEPENDENCIES
jquery-ui-rails jquery-ui-rails
kaminari (~> 0.15.1) kaminari (~> 0.15.1)
letter_opener letter_opener
mail_room (~> 0.4.0) mail_room (~> 0.4.1)
minitest (~> 5.3.0) minitest (~> 5.3.0)
mousetrap-rails mousetrap-rails
mysql2 mysql2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment