diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-04 17:27:47 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-04 17:27:47 +0200 |
| commit | 6a8359f3d3be01af6f5b124b61af7ee1c77c17d0 (patch) | |
| tree | 9e972713fc223d7a466ea2b1601a093d719f0817 /Gemfile.lock | |
| parent | 72e4bd5fc40c3b61792bf5f8897ab881775c7146 (diff) | |
| parent | c4b9bd041321df25764ad1de90f89b1f0dda9f33 (diff) | |
| download | gitlab-ce-6a8359f3d3be01af6f5b124b61af7ee1c77c17d0.tar.gz | |
Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'
# Conflicts:
# Gemfile.lock
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 d58d8535cdc..2d20a30e677 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -353,7 +353,7 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) - gitlab_git (10.0.1) + gitlab_git (10.0.2) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) |