summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:58:21 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:58:21 -0500
commitd4bb28c59bfe6bca8cb2e5f7706fddca9a9aaf87 (patch)
tree0d0247a1dcf6f8ed7f538781e6bf69364cf68182 /MAP.rst
parentMerge branch 'daniel/useragent' into daniel/3pidinvites (diff)
downloadsynapse-d4bb28c59bfe6bca8cb2e5f7706fddca9a9aaf87.tar.xz
Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions