diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-02 21:52:52 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-02 21:52:52 +0300 |
| commit | a706a2ba08c16ba518a49844114e15bb41119846 (patch) | |
| tree | 0de1b89a1cecf2dfab2c4ed9414198f34325978e /.gitignore | |
| parent | d969c12b09770fb1f473b40af7c07258aa188588 (diff) | |
| parent | 7741b37b1efa97ac9b17685cc626bd35ee52ca16 (diff) | |
| download | rabbitmq-server-git-a706a2ba08c16ba518a49844114e15bb41119846.tar.gz | |
Merge branch 'stable'
Conflicts:
src/rabbit_control_main.erl
src/rabbit_error_logger_file_h.erl
src/rabbit_registry.erl
src/rabbit_sasl_report_file_h.erl
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f7a1da4397..d88b753142 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ docs/rabbitmq-server.1.man.xml docs/rabbitmq-service.man.xml docs/rabbitmqctl.1 docs/rabbitmqctl.1.man.xml +docs/*.tmp # Dialyzer *.plt |