summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@gmail.com>2014-06-05 14:47:51 +0200
committerCiro Santilli <ciro.santilli@gmail.com>2014-06-05 14:47:51 +0200
commit27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93 (patch)
treeec432d27997c9be6cda977515839476c98de4fe4 /lib/api
parent7e41eca38ae4598e083372777c20ff6aa2b491ad (diff)
downloadgitlab-ce-27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93.tar.gz
Remove conflict artifact.
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions