merge in master

1 files changed, 8 insertions, 0 deletions

diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 00aa622b34..9d244059fc 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -96,3 +96,11 @@ class RoomCreationPreset(object):
 class ThirdPartyEntityKind(object):
     USER = "user"
     LOCATION = "location"
+
+
+# the version we will give rooms which are created on this server
+DEFAULT_ROOM_VERSION = "1"
+
+# vdh-test-version is a placeholder to get room versioning support working and tested
+# until we have a working v2.
+KNOWN_ROOM_VERSIONS = {"1", "vdh-test-version"}