Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse into babolivier/context_filters

This commit is contained in:
Brendan Abolivier 2019-12-04 14:29:03 +00:00
commit aeda1b3b94
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD

View File

@ -1524,4 +1524,4 @@ class LabelsTestCase(unittest.HomeserverTestCase):
tok=self.tok,
)
return event_id
return event_id