diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:15:22 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:15:22 +0100 |
| commit | d72dd38c13f287d7e2b7515889c10ede436baa69 (patch) | |
| tree | 0b930d8ff33e948f45b3fa5c01a8836769cc6d5f /Gemfile.lock | |
| parent | 3a4b5961bea66681ba9c455fcfd3ec497bfaed2f (diff) | |
| parent | 5fef55c11a7ea855e7b43ed274558a0893d0dc16 (diff) | |
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 20ea37fcc..0e720d7fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,6 +176,10 @@ GEM addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) link_header (0.0.8) lograge (0.4.1) actionpack (>= 4, < 5.1) @@ -432,6 +436,7 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails letter_opener + letter_opener_web link_header lograge nokogiri @@ -474,4 +479,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.13.6 + 1.13.7 |