summary refs log tree commit diff
path: root/synapse/api/urls.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 11:10:37 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 11:10:37 +0000
commit2ebf795c0ada8b30f22f9aca54753471a04649f6 (patch)
tree23710ca7b15e7d65eee8885a04b23a829ca00379 /synapse/api/urls.py
parentUpdate the current state of an event if we update auth events. (diff)
parentInclude content in notification pokes (diff)
downloadsynapse-2ebf795c0ada8b30f22f9aca54753471a04649f6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/api/urls.py')
-rw-r--r--synapse/api/urls.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index a299392049..693c0efda6 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -16,6 +16,7 @@
 """Contains the URL paths to prefix various aspects of the server with. """
 
 CLIENT_PREFIX = "/_matrix/client/api/v1"
+CLIENT_V2_ALPHA_PREFIX = "/_matrix/client/v2_alpha"
 FEDERATION_PREFIX = "/_matrix/federation/v1"
 WEB_CLIENT_PREFIX = "/_matrix/client"
 CONTENT_REPO_PREFIX = "/_matrix/content"