diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-16 17:49:53 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-16 17:49:53 -0500 |
| commit | e07c27fee427195d8d89f6278d0fc12dfeec3588 (patch) | |
| tree | c4676e5e953aecef8bf2bb715619027cd556c9cc /Gemfile.lock | |
| parent | 029b7d2e9266246feff2f165a10b16be1d7fe88e (diff) | |
| parent | 415159c28da1aec00bb383d46aad67a9de75faae (diff) | |
| download | gitlab-ce-e07c27fee427195d8d89f6278d0fc12dfeec3588.tar.gz | |
Merge branch 'master' into 4273-slash-commands
# Conflicts:
# app/services/issues/create_service.rb
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 ecce224adeb..30974d4c426 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.7.0.1) + httpclient (2.8.2) i18n (0.7.0) ice_nine (0.11.1) influxdb (0.2.3) |