diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-22 16:37:03 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-22 16:37:03 +0100 |
| commit | f96abe4b12da8c25d790f347afd58f1dbd4ac960 (patch) | |
| tree | 9e13a7c3217d7596e8dc99abdb1473a1b60c38c5 /.ruby-version | |
| parent | c3fe7388caa1bd49f25434b8109c4a1ab42d5b27 (diff) | |
| parent | 5803a5308f5a7a84cc84dd0a7d8a89565bae0717 (diff) | |
| download | gitlab-ce-f96abe4b12da8c25d790f347afd58f1dbd4ac960.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to '.ruby-version')
| -rw-r--r-- | .ruby-version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ruby-version b/.ruby-version index 530cdd91a20..ebf14b46981 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.4 +2.1.8 |