summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2014-11-12 13:14:13 +0200
committerValery Sizov <vsv2711@gmail.com>2014-11-12 13:14:13 +0200
commit1a7e3476351979d37cd5fa2b7b5800717487d758 (patch)
tree944564aabc35977b9771933ced239d46ddece10b /lib/api/files.rb
parent8146271d4043a91e8f65c7af41c6c015e7d155c3 (diff)
parentc58edd7c708c39a6e7c60bd96c7f97ced370f304 (diff)
downloadgitlab-ce-1a7e3476351979d37cd5fa2b7b5800717487d758.tar.gz
Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences
Conflicts: CHANGELOG
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions