Paul "LeoNerd" Evans 9705706a7f Merge branch 'develop' into paul/schema_breaking_changes		2014-09-03 17:40:42 +01:00
..
__init__.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
homeserver.py	Merge branch 'develop' into paul/schema_breaking_changes	2014-09-03 17:40:42 +01:00