diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
| commit | b55bd9ef95734a6805b11a8a8322149e885425a6 (patch) | |
| tree | 769f52169d7ad85d68aea3218c7e9116f9269b25 /Gemfile.lock | |
| parent | c24b70682448f23d7eb01853026cfe6abdf86190 (diff) | |
| parent | b4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff) | |
| download | gitlab-ce-b55bd9ef95734a6805b11a8a8322149e885425a6.tar.gz | |
Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui
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 fe9d7a2b6f9..b5f9c3beca7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -655,7 +655,7 @@ GEM retriable (1.4.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.0.7) + rouge (2.1.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) |