diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:58:21 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:58:21 -0500 |
| commit | d4bb28c59bfe6bca8cb2e5f7706fddca9a9aaf87 (patch) | |
| tree | 0d0247a1dcf6f8ed7f538781e6bf69364cf68182 /synapse/handlers/room.py | |
| parent | Merge branch 'daniel/useragent' into daniel/3pidinvites (diff) | |
| download | synapse-d4bb28c59bfe6bca8cb2e5f7706fddca9a9aaf87.tar.xz | |
Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
Diffstat (limited to 'synapse/handlers/room.py')
0 files changed, 0 insertions, 0 deletions