diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 14:53:10 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 14:53:10 +0200 |
| commit | 975e3887510cd09103363095cafd42fd688d920c (patch) | |
| tree | 535485b06e164ca13b4a6183d9708b49a0af9930 /lib/api | |
| parent | 30877effb15d8a3eccc13925549a4c97de93c58e (diff) | |
| parent | 4b964011cfd6861403726248574f5926edc5d495 (diff) | |
| download | gitlab-ce-975e3887510cd09103363095cafd42fd688d920c.tar.gz | |
Merge remote-tracking branch 'origin/master' into environments-and-deployments
# Conflicts:
# lib/ci/gitlab_ci_yaml_processor.rb
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions