diff options
| author | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
| commit | acded821c4ff9da11ce7f916ca8b0f369bcb4e87 (patch) | |
| tree | 6a797cfae11a8cf64277ff878c090d7905db9d19 /synapse/handlers | |
| parent | Remove vector specific style (diff) | |
| parent | Fix more typos in per-request metrics (diff) | |
| download | synapse-acded821c4ff9da11ce7f916ca8b0f369bcb4e87.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/room_member.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index b69f36aefe..ed2cda837f 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -232,7 +232,7 @@ class RoomMemberHandler(BaseHandler): if old_membership == "ban" and action != "unban": raise SynapseError( 403, - "Cannot %s user who was is banned" % (action,), + "Cannot %s user who was banned" % (action,), errcode=Codes.BAD_STATE ) |