diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
| commit | 8048f99c21d0299313dcda172aae22fda8c519d3 (patch) | |
| tree | edf02d0adf376ee0cce7caa9c541c687bc25f43f /app/models/user_callout.rb | |
| parent | 815947bf6785e1c458bad8d2d891e99279cab602 (diff) | |
| parent | 2c5e6b272e7984400ac4d297553b3f4f50a8d5c4 (diff) | |
| download | gitlab-ce-8048f99c21d0299313dcda172aae22fda8c519d3.tar.gz | |
Merge branch 'master' into 'qa-48464-add-edit-delete-file-scenario'sliaquat/gitlab-ce-qa-48464-add-edit-delete-file-scenario
# Conflicts:
# qa/qa.rb
Diffstat (limited to 'app/models/user_callout.rb')
0 files changed, 0 insertions, 0 deletions