Daniel Wagner-Hall d4bb28c59b Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation""
This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
2015-10-06 09:58:21 -05:00
..
2015-10-01 09:21:36 +01:00
2015-10-06 09:53:33 -05:00
2015-09-10 09:58:32 +01:00
2015-09-15 15:50:13 +01:00