diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-22 18:01:38 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-22 18:01:38 +0100 |
| commit | 3d81f1da6e9a0b7370c3318a9f7851af88918ace (patch) | |
| tree | 0265dc26079da9975184de44d9b28bfb9bd9d357 /.teatro.yml | |
| parent | ba07a4c96a90a0cbe81ae7e987f32cc8eac20323 (diff) | |
| parent | 0e51ca7c4841bb388c0decb57ecc64af86c77805 (diff) | |
| download | gitlab-ce-3d81f1da6e9a0b7370c3318a9f7851af88918ace.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to '.teatro.yml')
0 files changed, 0 insertions, 0 deletions