diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 21:54:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 21:54:25 +0300 |
| commit | 6f70dcbe05dbba35f7d950674d293a4c7d867d44 (patch) | |
| tree | 3ea3a7ec0546d59a00364654a2885b0e6a07b335 /Makefile | |
| parent | 8b5a89209f1b01c7d7a650eadee91746443314b1 (diff) | |
| parent | d173fd774a28490eb5e4a66a588d92c0c95540fe (diff) | |
| download | rabbitmq-server-git-6f70dcbe05dbba35f7d950674d293a4c7d867d44.tar.gz | |
Merge branch 'stable'
Conflicts:
test/src/rabbit_tests.erl
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions