Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-19 05:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device

Browse source
This commit is contained in:
Mark Haines 2016-08-26 14:35:31 +01:00
commit 4bbef62124
27 changed files with 866 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/rest/client/v2_alpha/thirdparty.py
View file

@ -18,8 +18,8 @@ import logging
from twisted.internet import defer
from synapse.api.constants import ThirdPartyEntityKind
from synapse.http.servlet import RestServlet
from synapse.types import ThirdPartyEntityKind
from ._base import client_v2_patterns
logger = logging.getLogger(__name__)