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-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