diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-14 14:00:24 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-14 14:00:24 +0000 |
| commit | 75130bbe52f869a1520959d09997bf438d3fc6e3 (patch) | |
| tree | 48c2b6d2ea199a17d6fac1e32f67905022302a56 | |
| parent | 725b383718544da5ef1927887f9aa1e3d91ffb50 (diff) | |
| parent | 5c13c734baf2d71191f4f0487f5ff1eb4e5c7708 (diff) | |
| download | gitlab-ce-75130bbe52f869a1520959d09997bf438d3fc6e3.tar.gz | |
Merge branch 'revert-3c2cff0c' into 'master'
Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"
See merge request !13533
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ab01a556561..d443209349d 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.4) + charlock_holmes (0.7.3) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) |