diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-14 11:02:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-14 11:02:59 +0000 |
| commit | 3c2cff0c666c2de9ce636b1a5f7266f6d3e604ea (patch) | |
| tree | 67a54bf5dbe32d53dc3077155d99e1c8f2f3d528 | |
| parent | cccbb4be2741bc9cf4545537c5105409a1a5ebbf (diff) | |
| parent | 35147a7e4466678cc7c5044e0a0b5c5060fac16c (diff) | |
| download | gitlab-ce-3c2cff0c666c2de9ce636b1a5f7266f6d3e604ea.tar.gz | |
Merge branch 'zj-fix-charlock_holmes' into 'master'
Update charlock_holmes
See merge request !13523
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d443209349d..ab01a556561 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,7 +113,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) - charlock_holmes (0.7.3) + charlock_holmes (0.7.4) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) |