summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-30 13:23:08 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-30 13:23:08 -0700
commitc66c3a34c4d73766a08d9ed48d23d2c51c901ff2 (patch)
tree2da9a45bfb375ec0243cd52f84940e11b05d2b7b /lib/api/files.rb
parent43a680b9e9c9c0a063777c336c2ef75aece4fe05 (diff)
parent718661f9aa4bfe9e767f2e49880bd3774499e3d2 (diff)
downloadgitlab-ce-c66c3a34c4d73766a08d9ed48d23d2c51c901ff2.tar.gz
Merge pull request #9056 from mavimo/patch-3
Fix merge errors on CHANGELOG
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions