diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-18 17:15:05 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-18 17:15:05 +0100 |
commit | 1b9e2530de255aabd187b1a6460eefa650fa4acf (patch) | |
tree | caf3817ea0d92cbe3149fb565cae2b1e8c5dfabb /lib/api/commit_statuses.rb | |
parent | 3639ebd081a6f008c2d0824953dc37168cf59200 (diff) | |
parent | a54bd0ff77fd31791208d1fd23e6169e0e72b331 (diff) | |
download | gitlab-ce-1b9e2530de255aabd187b1a6460eefa650fa4acf.tar.gz |
Merge branch 'master' into edit-on-fork
# Conflicts:
# app/views/projects/tree/_tree_header.html.haml
Diffstat (limited to 'lib/api/commit_statuses.rb')
0 files changed, 0 insertions, 0 deletions