diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-02 20:42:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 20:42:10 +0100 |
| commit | 80462e1b8d472a1b3dc02b2bb4024e8642a3e613 (patch) | |
| tree | 2b90d6124f8117e42b8cb43aaf70373007d3be0b /Gemfile.lock | |
| parent | 44e6c2dd74b90e1e0557be578b7b3df47ec2ae1d (diff) | |
| parent | d32d33f408d77b7bdbcab1f2b4e5b1cd057ce5a0 (diff) | |
Merge pull request #842 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 467fc3692..56522496a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,6 +292,10 @@ GEM json-ld (2.2.1) multi_json (~> 1.12) rdf (>= 2.2.8, < 4.0) + json-ld-preloaded (2.2.3) + json-ld (>= 2.2, < 4.0) + multi_json (~> 1.12) + rdf (>= 2.2, < 4.0) jsonapi-renderer (0.2.0) jwt (2.1.0) kaminari (1.1.1) @@ -696,6 +700,7 @@ DEPENDENCIES idn-ruby iso-639 json-ld (~> 2.2) + json-ld-preloaded (~> 2.2) kaminari (~> 1.1) letter_opener (~> 1.4) letter_opener_web (~> 1.3) |