diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-30 20:10:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 20:10:09 +0100 |
| commit | 08c0f8b67c7316b020c5623c69d02665146ebd57 (patch) | |
| tree | 9411daf86f412a69c2536cfc302b484bd3ea16ae /Gemfile.lock | |
| parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
| parent | 0d6b8f36aaee9c8c68c64ce4a63bcc66c6faf78d (diff) | |
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b9f7393ef..59b018e0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,7 +321,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) |