Matthew Hodgson 383c4ae59c Merge branch 'dinsic' into matthew/derive-mxid-from-3pid		2018-05-03 23:39:08 +01:00
..
client	Merge branch 'dinsic' into matthew/derive-mxid-from-3pid	2018-05-03 23:39:08 +01:00
key	Add federation_domain_whitelist option (#2820)	2018-01-22 19:11:18 +01:00
media	Replace old-style raise with six.reraise	2018-04-06 23:06:24 +02:00
__init__.py	Add local group server support	2017-07-17 12:03:49 +01:00