diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 13:04:00 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 13:04:00 +0200 |
| commit | 778d72664f386dfee45dab171f137395739958f6 (patch) | |
| tree | 7f2c902f4b97ac29aa97e96e877da201130a33b3 /.vagrant_enabled | |
| parent | 452c076a34cc11cc97f4b1c3113e86ce4367e055 (diff) | |
| parent | c369cc8bf42a680b2b0fc9721a9a7926dc5426f6 (diff) | |
| download | gitlab-ce-778d72664f386dfee45dab171f137395739958f6.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-exportfeature/project-export
# Conflicts:
# app/models/ci/pipeline.rb
Diffstat (limited to '.vagrant_enabled')
0 files changed, 0 insertions, 0 deletions