diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-29 22:13:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 22:13:06 +0200 |
| commit | 491588f6b42fb42cf0b8e648aff958bac1add407 (patch) | |
| tree | 3e58e945222e0335ef618bedd64cea0283a51182 /Gemfile.lock | |
| parent | e8714530a4173500a503452e9a9b5755156f14cd (diff) | |
| parent | 9707dbee6fbbf8a5fa3c92762588a5405364acc6 (diff) | |
Merge pull request #1341 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 072c6791a..111bdabcd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -314,18 +314,18 @@ GEM rdf (~> 3.1) jsonapi-renderer (0.2.2) jwt (2.2.1) - kaminari (1.2.0) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.0) - kaminari-activerecord (= 1.2.0) - kaminari-core (= 1.2.0) - kaminari-actionview (1.2.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.2.0) - kaminari-activerecord (1.2.0) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.2.0) - kaminari-core (1.2.0) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) launchy (2.5.0) addressable (~> 2.7) letter_opener (1.7.0) |