Mark Haines 7179fdd550 Merge pull request #528 from matrix-org/markjh/missing_yield ... Add missing yield in push_rules set enabled		2016-01-25 21:26:30 +01:00
..
client	Merge pull request #528 from matrix-org/markjh/missing_yield	2016-01-25 21:26:30 +01: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