diff options
| author | Reverite <github@reverite.sh> | 2019-10-05 12:13:22 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-05 12:13:22 -0700 |
| commit | 46ada47e09af0da9c776ef83c0ff034c720a83d6 (patch) | |
| tree | 54fd4b1d5fba6d592f328955ef5968608bbe716f /Gemfile.lock | |
| parent | 333b5e25f0a615a9518d402ef10dceb70190a52f (diff) | |
| parent | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c05b85b2a..9d506d106 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -752,6 +752,7 @@ DEPENDENCIES ox (~> 2.11) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) + parallel (~> 1.17) parallel_tests (~> 2.29) parslet pg (~> 1.1) @@ -804,7 +805,7 @@ DEPENDENCIES webpush RUBY VERSION - ruby 2.6.4p104 + ruby 2.6.5p114 BUNDLED WITH 1.17.3 |