mirror of
https://github.com/element-hq/synapse
synced 2024-10-02 23:12:41 +00:00
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
38e3241eb7
3 changed files with 3 additions and 3 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
0.6.1a
|
||||
0.6.1b
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
""" This is a reference implementation of a Matrix home server.
|
||||
"""
|
||||
|
||||
__version__ = "0.6.1a"
|
||||
__version__ = "0.6.1b"
|
||||
|
|
|
@ -106,7 +106,7 @@ def serialize_event(hs, e, client_event=True):
|
|||
|
||||
if "age_ts" in d["unsigned"]:
|
||||
now = int(hs.get_clock().time_msec())
|
||||
d["unsigned"]["age"] = now - d["unsigned"]["age_ts"]
|
||||
d["age"] = now - d["unsigned"]["age_ts"]
|
||||
del d["unsigned"]["age_ts"]
|
||||
|
||||
d["user_id"] = d.pop("sender", None)
|
||||
|
|
Loading…
Reference in a new issue