summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-25 18:21:42 +0100
committerErik Johnston <erik@matrix.org>2014-09-25 18:21:42 +0100
commit7a8307fe7c3f6b13c78681f1eb320149238828ca (patch)
tree8693ec59f906c076abb534f01c32573619bf7c8c /MAP.rst
parentAdd realm to coturn options (it needs it). (diff)
parentMerge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff)
downloadsynapse-7a8307fe7c3f6b13c78681f1eb320149238828ca.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions