diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-23 17:15:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-23 17:15:57 +0200 |
| commit | 8f3096b846f6af87d74304c98fcc66932140f42d (patch) | |
| tree | 034c4072c9447bb98cb130ed2c5d005f266ae63b /Gemfile.lock | |
| parent | 0c7f710be1208397f2d803270a503c1224f19831 (diff) | |
| parent | 65867b6e6170ab6bc4db6d94b46cd3ddd6b82113 (diff) | |
Merge branch 'master' into glitch-soc/merge-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 c2af2719e..283a6c25d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.12.1) - parallel_tests (2.23.0) + parallel_tests (2.24.0) parallel parser (2.5.1.2) ast (~> 2.4.0) @@ -717,7 +717,7 @@ DEPENDENCIES ox (~> 2.10) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) - parallel_tests (~> 2.23) + parallel_tests (~> 2.24) pg (~> 1.1) pghero (~> 2.2) pkg-config (~> 1.3) |