diff options
author | Thirumal S <thirumals@spritle.com> | 2015-11-03 22:49:09 +0530 |
---|---|---|
committer | Thirumal S <thirumals@spritle.com> | 2015-11-03 22:49:09 +0530 |
commit | c12a4b2a319f9d56db5170ecff736f5463c9d334 (patch) | |
tree | 946996e7c75a429b66e98fcc6eafcc4585dbb617 /lib/api/commit_statuses.rb | |
parent | 74416daa660a047d3a7cb00e11e1d775b4ea0937 (diff) | |
parent | 482a17089fae42bd15303206788734ab9ac99453 (diff) | |
download | gitlab-ce-c12a4b2a319f9d56db5170ecff736f5463c9d334.tar.gz |
merge conflict fixed
Diffstat (limited to 'lib/api/commit_statuses.rb')
0 files changed, 0 insertions, 0 deletions