diff options
author | Erik Johnston <erik@matrix.org> | 2016-07-28 14:56:32 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-07-28 14:56:32 +0100 |
commit | 5fb41a955c9cf35fd25f92b39f58489dd77fb37e (patch) | |
tree | 2b90c7e1f54550a3af8c84e41f4b6cb9b8bb2bb1 /synapse | |
parent | Merge pull request #962 from matrix-org/markjh/retry (diff) | |
parent | Add authors to changelog (diff) | |
download | synapse-5fb41a955c9cf35fd25f92b39f58489dd77fb37e.tar.xz |
Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |