summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-02-23 11:27:29 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-02-23 11:27:29 +0300
commit9ad0b6d6ec5b248aa09558ccc561ffa0e2b1a6c8 (patch)
tree125f92efee6c3686c7ffdf4697db5ef9e4a2aa95
parent81885ac7b8aa09e105ba9f1c977f49fa69c9af7a (diff)
parent2ca7c479e13a4d4ebce29591a0c9590579030516 (diff)
downloadrabbitmq-server-git-9ad0b6d6ec5b248aa09558ccc561ffa0e2b1a6c8.tar.gz
Merge branch 'master' into rabbitmq-server-550
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9e0bfad27d..c4375bbe48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
.erlang.mk/
cover/
deps/
+debug/
doc/
ebin/
etc/