From: Tom Hughes Date: Mon, 29 Jun 2020 09:32:46 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2679' X-Git-Tag: live~3495 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/efaddc5070c175e9f6acfe8cb9ed0bb15e89bf84?hp=c9aebe6980f823bc09e1f536195eb5c18d237be5 Merge remote-tracking branch 'upstream/pull/2679' --- diff --git a/Gemfile.lock b/Gemfile.lock index 92c2eb4a5..2f023eba1 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)