mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-03 07:34:48 -04:00
Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device
This commit is contained in:
commit
4bbef62124
27 changed files with 866 additions and 450 deletions
|
@ -271,10 +271,3 @@ class RoomStreamToken(namedtuple("_StreamToken", "topological stream")):
|
|||
return "t%d-%d" % (self.topological, self.stream)
|
||||
else:
|
||||
return "s%d" % (self.stream,)
|
||||
|
||||
|
||||
# Some arbitrary constants used for internal API enumerations. Don't rely on
|
||||
# exact values; always pass or compare symbolically
|
||||
class ThirdPartyEntityKind(object):
|
||||
USER = 'user'
|
||||
LOCATION = 'location'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue