diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-06 07:20:02 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-06 07:20:02 +0000 |
| commit | db5f0e7e88667f93b8d80486daa6022ac15c45e0 (patch) | |
| tree | 079cf91a1e278e58736d18e3dc5da5bd94899beb | |
| parent | 4f1c2386b3328591c63b47cdb9fc9cd824f8930f (diff) | |
| parent | 01a097d77a529615791cf1f4cb4153c45735e4f5 (diff) | |
| download | gitlab-ce-db5f0e7e88667f93b8d80486daa6022ac15c45e0.tar.gz | |
Merge branch 'update_gitlab_grit' into 'master'
Update gitlab-grit
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d0004fba159..0428a9df483 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,7 +167,7 @@ GEM stringex (~> 1.5.1) gitlab-grack (2.0.0.pre) rack (~> 1.5.1) - gitlab-grit (2.6.3) + gitlab-grit (2.6.4) charlock_holmes (~> 0.6.9) diff-lcs (~> 1.1) mime-types (~> 1.15) |