summaryrefslogtreecommitdiff
path: root/LICENSE-MPL-RabbitMQ
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2018-11-22 09:47:16 +0100
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2018-11-22 09:47:16 +0100
commit744a307dea1befdadc030b453dfa0eeab74aae29 (patch)
tree896b0a99c2d796aa31c499d3f31b887a5bd54f84 /LICENSE-MPL-RabbitMQ
parent5745100835f4ea95e5ff6cd92d949ddc7dd296a2 (diff)
parentaf68fc873ef7b34eba922cedac0e62b99adf1dd0 (diff)
downloadrabbitmq-server-git-744a307dea1befdadc030b453dfa0eeab74aae29.tar.gz
Merge branch 'master' into rabbitmq-server-1743-exclusive-consumer
Conflicts: src/rabbit_amqqueue.erl src/rabbit_amqqueue_process.erl
Diffstat (limited to 'LICENSE-MPL-RabbitMQ')
0 files changed, 0 insertions, 0 deletions