summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-12-16 08:02:28 -0800
committerStan Hu <stanhu@gmail.com>2015-12-16 08:02:28 -0800
commit02f56731713948be8443e6e97eb55ae05b5ac95a (patch)
tree04a81f659c1a6582b27a027ff5e27f3c0e1f8576 /lib/api/files.rb
parent28832fef7c88f7050639791af8e51c4acb58cff6 (diff)
downloadgitlab-ce-02f56731713948be8443e6e97eb55ae05b5ac95a.tar.gz
Fix bad merge
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions