diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-13 10:01:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-13 10:01:22 +0000 |
| commit | 38e3241eb78d365e8264120574bc5970cfd5a326 (patch) | |
| tree | f28cd87265be9df0d7bdc0b16b2645b8f9cd5657 /synapse | |
| parent | Use float rather than integer divisions to turn msec into sec - so timeouts u... (diff) | |
| parent | Bump version (diff) | |
| download | synapse-38e3241eb78d365e8264120574bc5970cfd5a326.tar.xz | |
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/events/utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 4d5d70d265..895a0766d2 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.6.1a" +__version__ = "0.6.1b" diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 4687d96f26..bcb5457278 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -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) |