summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-21 11:46:45 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-21 11:46:45 +0300
commitc624b45bd01591f31b63f6c94599d08f2f27c652 (patch)
tree2248800dc1c74cf93be40c95b96630f38efe2a04 /lib/api/files.rb
parent72abe9f679043a1ac566f60109b21cadace204d7 (diff)
parent62b322d7b567f1fae2ea8b5a3b0e71a62506e47d (diff)
downloadgitlab-ce-c624b45bd01591f31b63f6c94599d08f2f27c652.tar.gz
Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwazerty-hipchat_api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions