summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-30 17:02:32 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-30 17:02:32 +0000
commit6fba9fd20c8f29f6034236f653893a3bda165be2 (patch)
tree1ce9b816637de72b36c8acfe03ac791d842b0905 /synapse/api
parentby default include m.room.encryption on invites (#3902) (diff)
parentv0.99.0rc2 (diff)
downloadsynapse-6fba9fd20c8f29f6034236f653893a3bda165be2.tar.xz
Merge remote-tracking branch 'origin/release-v0.99.0' into develop
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 39ff4f62eb..f47c33a074 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -110,7 +110,7 @@ class RoomVersions(object):
 
 
 class RoomDisposition(object):
-    STABLE = "stable",
+    STABLE = "stable"
     UNSTABLE = "unstable"