diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-06-05 16:46:09 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-06-05 16:46:09 +0200 |
| commit | 63cbebfe6c2229dd2c65bd82ee1b97aed5bcabbf (patch) | |
| tree | 6b46920cfee352d2b9502fc7ba743d757bf33494 /lib/api | |
| parent | 70a6af9328b663c93a5802bf689362525ec4ae87 (diff) | |
| parent | 27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93 (diff) | |
| download | gitlab-ce-63cbebfe6c2229dd2c65bd82ee1b97aed5bcabbf.tar.gz | |
Merge pull request #7081 from cirosantilli/conflict-artifact
Remove conflict artifact.
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions