diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-10 13:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 13:34:14 -0400 |
| commit | c9df53044a333276853f7dc7ef2aed6d48df087f (patch) | |
| tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /Gemfile.lock | |
| parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
| parent | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (diff) | |
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ef99e0d7b..ddb97dd94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,6 +225,7 @@ GEM terminal-table (>= 1.5.1) idn-ruby (0.1.0) ipaddress (0.8.3) + iso-639 (0.2.8) jmespath (1.3.1) json (2.1.0) json-ld (2.1.5) @@ -560,6 +561,7 @@ DEPENDENCIES httplog (~> 0.99) i18n-tasks (~> 0.9) idn-ruby + iso-639 json-ld-preloaded (~> 2.2.1) kaminari (~> 1.0) letter_opener (~> 1.4) |