diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
| commit | 1c448d647488dc3dd3b72e9fe15efb971612157c (patch) | |
| tree | 2b31e4ed019a29043aa07d9d95e7f8b64e309bbd /Gemfile.lock | |
| parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
| parent | 66019b0ec4aaa584e58e91583425ed7c0d55c28e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
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) |