diff options
author | Ask Solem <ask@celeryproject.org> | 2014-06-02 17:20:32 +0100 |
---|---|---|
committer | Ask Solem <ask@celeryproject.org> | 2014-06-02 17:20:32 +0100 |
commit | 19c83a1b52fa82caea016f4ac0848b45e28d59ed (patch) | |
tree | 94f7f7e3472d875c9eca33de353f56df9306b6ad /docs | |
parent | 6547f7f8b8d4f0cd258aeb6b08dfc83fdfabeb22 (diff) | |
parent | 202e5b56e83c677bd0b0c9f482e526f3c1cfac2a (diff) | |
download | kombu-19c83a1b52fa82caea016f4ac0848b45e28d59ed.tar.gz |
Merge branch '3.0'
Conflicts:
README.rst
kombu/__init__.py
kombu/async/hub.py
kombu/utils/url.py
Diffstat (limited to 'docs')
-rw-r--r-- | docs/reference/index.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/reference/index.rst b/docs/reference/index.rst index 4e14f3fe..39e471cb 100644 --- a/docs/reference/index.rst +++ b/docs/reference/index.rst @@ -27,7 +27,7 @@ kombu.async.hub kombu.async.semaphore kombu.async.timer - kombu.async..debug + kombu.async.debug kombu.transport kombu.transport.pyamqp kombu.transport.librabbitmq |