summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-26 11:05:50 +0100
committerErik Johnston <erik@matrix.org>2015-05-26 11:05:50 +0100
commit2651fd5e248e89e1d8fa7d6cbbf706c310390889 (patch)
tree79d4bbc30758d01a469a9e5728279ee6cfa8754b /README.rst
parentchangelog (diff)
parentMerge pull request #166 from matrix-org/bugs/SYN-390 (diff)
downloadsynapse-2651fd5e248e89e1d8fa7d6cbbf706c310390889.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions