Merge branch 'develop' into markjh/direct_to_device_federation

This commit is contained in:
Mark Haines 2016-09-08 13:43:43 +01:00
commit fa9d36e050
13 changed files with 547 additions and 137 deletions

View file

@ -86,6 +86,9 @@ class SlavedEventStore(BaseSlavedStore):
_get_state_groups_from_groups = (
StateStore.__dict__["_get_state_groups_from_groups"]
)
_get_state_groups_from_groups_txn = (
DataStore._get_state_groups_from_groups_txn.__func__
)
_get_state_group_from_group = (
StateStore.__dict__["_get_state_group_from_group"]
)