diff options
| author | George Claghorn <george@basecamp.com> | 2018-10-18 17:39:04 -0400 |
|---|---|---|
| committer | George Claghorn <george@basecamp.com> | 2018-10-18 17:39:04 -0400 |
| commit | f33ccec86c02205cc82dd14dea24a5ad3f27f502 (patch) | |
| tree | 8b61db32444ab456e1fc9913ccc80e454e2ef123 /Gemfile.lock | |
| parent | 4411095290f24ccb2e263c9534acfd19d081120f (diff) | |
| parent | cf8d76fdb42ab33c778b1787fb2ebe06481e2e3f (diff) | |
| download | rails-f33ccec86c02205cc82dd14dea24a5ad3f27f502.tar.gz rails-f33ccec86c02205cc82dd14dea24a5ad3f27f502.tar.bz2 rails-f33ccec86c02205cc82dd14dea24a5ad3f27f502.zip | |
Merge branch 'master' into ingresses
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 96ed132ea1..2251704810 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) @@ -144,4 +144,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.16.5 + 1.16.6 |