diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-04 17:37:34 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-04 17:37:34 +0000 |
commit | 8046df6efa5509096c3b33c292f03f80c95b6481 (patch) | |
tree | 079a9ba974f0c3b5096438ca9cd12ac38c794390 /README.rst | |
parent | Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder... (diff) | |
parent | More s/instance_handle/profile_tag/ (diff) | |
download | synapse-8046df6efa5509096c3b33c292f03f80c95b6481.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_client_retries
Diffstat (limited to 'README.rst')
-rw-r--r-- | README.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.rst b/README.rst |