Merge branch 'develop' into application-services

This commit is contained in:
Kegan Dougal 2015-02-11 10:03:24 +00:00
commit 9978c5c103
26 changed files with 240 additions and 115 deletions

View file

@ -46,7 +46,7 @@ class ClientDirectoryServer(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_alias):
content = _parse_json(request)
if not "room_id" in content:
if "room_id" not in content:
raise SynapseError(400, "Missing room_id key",
errcode=Codes.BAD_JSON)