diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 19:10:47 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 19:10:47 -0500 |
| commit | 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae (patch) | |
| tree | ad65947aa96daf682cc61851fccbf48050cbe056 /.gitignore | |
| parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
| download | synapse-34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.tar.xz | |
Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"
This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions