summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-10-25 21:28:25 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-10-25 21:28:25 +0300
commitcb8de07dbb357edd1202baa0bdc487d80a861285 (patch)
tree156cc050f0cb4ae8d860f06618ab9074ac79101e /docs
parente9d1588e5b3e9fa767f6665cbbe70997e98332d9 (diff)
parent2545c1b136f4993019bf8368057def2a546ed9f8 (diff)
downloadrabbitmq-server-git-cb8de07dbb357edd1202baa0bdc487d80a861285.tar.gz
Merge branch 'stable'
Conflicts: src/rabbit_channel.erl src/rabbit_control_main.erl
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions