diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-13 16:55:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 16:55:07 +0100 |
| commit | 3005e473a0df4d2ea942dcc33e01c5e4c15b81fa (patch) | |
| tree | 8d0b0e635bf12a56ae99278ab206684da2a9aad1 /Gemfile.lock | |
| parent | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (diff) | |
| parent | 387f253f3100317ae247928aa9168f431879ecb6 (diff) | |
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 49e6fe66d..1b71f2f12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_record_query_trace (1.6.1) + active_record_query_trace (1.6.2) activejob (5.2.2) activesupport (= 5.2.2) globalid (>= 0.3.6) @@ -148,7 +148,7 @@ GEM cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) |