diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-04 12:04:55 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-04 12:04:55 -0500 |
| commit | 2058922cc9dc4f622ecd64ebd102f29b0a43a177 (patch) | |
| tree | 89c86321fd30a76e7369b31337fce761642364ee /Gemfile.lock | |
| parent | 1aa25ee0f52a0f9dd045897949be688de0e45bfb (diff) | |
| parent | 54e80bec735bd0329fc4db08d36103d5e80f358e (diff) | |
Merge branch 'merge-upstream' into gs-master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2e2cf1f3d..36554c1ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -709,7 +709,7 @@ DEPENDENCIES pg (~> 1.0) pghero (~> 2.1) pkg-config (~> 1.3) - posix-spawn + posix-spawn (~> 0.3) premailer-rails private_address_check (~> 0.4.1) pry-byebug (~> 3.6) |