OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop

pull/39/head
Erik Johnston 2015-01-13 10:01:22 +00:00
parent 02ffbb20d0 1d3d37937d
commit 38e3241eb7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.6.1a
0.6.1b

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.6.1a"
__version__ = "0.6.1b"

2
synapse/events/utils.py
View File

@ -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)