Daniel Wagner-Hall 82e8a2d763 Merge pull request #356 from matrix-org/daniel/3pidyetagain ... Get display name from identity server, not client		2015-11-10 12:44:17 +00:00
..
client	Merge pull request #356 from matrix-org/daniel/3pidyetagain	2015-11-10 12:44:17 +00:00
key	…
media	…
__init__.py	…