Daniel Wagner-Hall 34d26d3687 Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"
This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing
changes made to b43930d4c9479973fb7225818e2e51bec022c4e6.
2015-10-05 19:10:47 -05:00
..
2015-08-18 11:19:08 +01:00
2015-08-13 16:58:10 +01:00
2015-08-26 16:03:17 +01:00
2015-08-25 16:37:37 +01:00
2015-08-26 11:08:23 +01:00