Mark Haines 9c1f853d58 Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code		2016-01-13 13:32:59 +00:00
..
client	Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code	2016-01-13 13:32:59 +00:00
key	copyrights	2016-01-07 04:26:29 +00:00
media	Merge pull request #478 from matrix-org/daniel/userobject	2016-01-11 17:50:22 +00:00
__init__.py	copyrights	2016-01-07 04:26:29 +00:00