diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-01-07 14:56:18 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-01-07 14:56:18 +0300 |
| commit | 41b8a238ce4bd7f091d46fb9b89b7456fde17ddf (patch) | |
| tree | 5f3ab03e9d8aec93cb53df744e9a9e19fc6a9d6f /Gemfile.lock | |
| parent | da912c8f4ce6a8e828bc0ef4dd352fd54df0739f (diff) | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
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 2b42f325503..a1168ed3b7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -887,7 +887,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_emoji (~> 0.2.0) - gitlab_git (~> 7.2.20) + gitlab_git (~> 7.2.22) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) |