summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-13 22:26:05 +0000
committerRobert Speicher <robert@gitlab.com>2015-10-13 22:26:05 +0000
commit82da19cecd6390d2372bad36da0a9f89b21abb38 (patch)
tree93713d526a2fafdc8b8cd2bac795711bff44a237 /lib/api/api.rb
parent52983a84b9dbb8beaef3ebaf3d502c6ec34f7362 (diff)
parentc2c8f8acc41747280356e157e749c1cafbd807e3 (diff)
downloadgitlab-ce-82da19cecd6390d2372bad36da0a9f89b21abb38.tar.gz
Merge branch 'mailroom-arbitration' into 'master'
Enable arbitration in MailRoom Fixes #2870. See merge request !1566
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions