diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 08:50:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 08:50:33 +0000 |
| commit | 6f123ebf751f568a6e0edd5969eabd4d4515a135 (patch) | |
| tree | 77cbde834ae01c2eecd4d0c7bcc1c07e26693cdf /Gemfile.lock | |
| parent | fd86a142416fb0b760f8247dbd6dbec6b7cc6a32 (diff) | |
| parent | 8e0496dca692cae91ffa179924f0b3e989ed550b (diff) | |
| download | gitlab-ce-6f123ebf751f568a6e0edd5969eabd4d4515a135.tar.gz | |
Merge branch 'rouge-2.2.1' into 'master'
Bump rouge to 2.2.1
See merge request !13887
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 8634a9e8822..9ab7aeb929b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -723,7 +723,7 @@ GEM retriable (1.4.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.2.0) + rouge (2.2.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) |