diff options
| author | karen Carias <karen@gitlab.com> | 2015-08-10 16:05:59 -0700 |
|---|---|---|
| committer | karen Carias <karen@gitlab.com> | 2015-08-10 16:05:59 -0700 |
| commit | 37b4cfea3aa06b9046f8577be5f4cd7bcdf8017a (patch) | |
| tree | 744caca015748626b3a868bff5becdcef3de2995 /lib/api/files.rb | |
| parent | 8344c7950838a4f83307a208865dad4b28ee3b96 (diff) | |
| download | gitlab-ce-37b4cfea3aa06b9046f8577be5f4cd7bcdf8017a.tar.gz | |
fixed conflict and comment
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions