From: Tom Hughes Date: Mon, 29 Jun 2020 09:32:43 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2678' X-Git-Tag: live~3148 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0c842480e75ec0ff9f5884ad67fb2f1cb01b1de2?hp=c7076ef2a06ea30d271b979ad16cb4a3a504c6ab Merge remote-tracking branch 'upstream/pull/2678' --- diff --git a/Gemfile.lock b/Gemfile.lock index 3f03eca58..c02d52eaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,7 +246,7 @@ GEM json (2.3.0) jwt (2.2.1) kgio (2.11.3) - kramdown (2.2.1) + kramdown (2.3.0) rexml libxml-ruby (3.2.0) listen (3.2.1)