summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 10:34:40 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 10:34:40 +0000
commit1be67eca8a1b9ccf86b58c1b8a9a6c5c5998956a (patch)
treef1e77a10168902b5a50e65bba6dd2fea8ce19469 /synapse/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
parentMore docs (diff)
downloadsynapse-1be67eca8a1b9ccf86b58c1b8a9a6c5c5998956a.tar.xz
Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions