summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/sendtodevice.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-17 15:07:41 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-05-17 15:07:41 +0100
commitd6e2f9f9daaa41d881052b467c1366635eed502c (patch)
treec25dd06cc9b552e4a1e7c8d5866c0fa51cf1d05d /synapse/rest/client/v2_alpha/sendtodevice.py
parentMerge branch 'release-v0.99.4' into dinsic (diff)
parentLint (diff)
downloadsynapse-d6e2f9f9daaa41d881052b467c1366635eed502c.tar.xz
Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17
Diffstat (limited to 'synapse/rest/client/v2_alpha/sendtodevice.py')
-rw-r--r--synapse/rest/client/v2_alpha/sendtodevice.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sendtodevice.py b/synapse/rest/client/v2_alpha/sendtodevice.py

index a9e9a47a0b..21e9cef2d0 100644 --- a/synapse/rest/client/v2_alpha/sendtodevice.py +++ b/synapse/rest/client/v2_alpha/sendtodevice.py
@@ -29,7 +29,6 @@ logger = logging.getLogger(__name__) class SendToDeviceRestServlet(servlet.RestServlet): PATTERNS = client_v2_patterns( "/sendToDevice/(?P<message_type>[^/]*)/(?P<txn_id>[^/]*)$", - v2_alpha=False ) def __init__(self, hs):