diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-28 14:49:34 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-28 14:49:34 +0100 |
| commit | 590e237d552a913d72161f0e40743418251f11a8 (patch) | |
| tree | 0743722eae0099ac06ac39573e777b5d9a335e5f /Gemfile | |
| parent | b636f83e5910d10a954464370efe42cc14a097ba (diff) | |
| parent | 9bf47f06ab69a1592cec87825aaaf5bb4adec464 (diff) | |
| download | gitlab-ce-590e237d552a913d72161f0e40743418251f11a8.tar.gz | |
Merge branch 'master' into highlight-blame
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -302,7 +302,7 @@ end gem "newrelic_rpm", '~> 3.9.4.245' gem 'newrelic-grape' -gem 'octokit', '~> 3.7.0' +gem 'octokit', '~> 3.8.0' gem "mail_room", "~> 0.6.1" |