diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-16 23:10:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 23:10:12 +0200 |
| commit | 4bf43e6f3e93643d989a2872763b41505fab2206 (patch) | |
| tree | e1b781fe4fae9d02284e5e836338cc598431413f /Gemfile.lock | |
| parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
| parent | 78ac246b877072bb5f94da34d29612fafde3a8ae (diff) | |
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
Merge changes from upstream
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 0656f16fd..21889164e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ GEM pghero (2.1.0) activerecord pkg-config (1.3.0) - posix-spawn (0.3.13) + posix-spawn (0.3.12) powerpack (0.1.1) premailer (1.11.1) addressable @@ -714,7 +714,7 @@ DEPENDENCIES pg (~> 1.0) pghero (~> 2.1) pkg-config (~> 1.3) - posix-spawn (~> 0.3) + posix-spawn (= 0.3.12) premailer-rails private_address_check (~> 0.4.1) pry-byebug (~> 3.6) |