diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-13 10:00:47 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-13 10:00:47 +0000 |
| commit | b1a38c39add2fa6575ecb96072f3c5e556e96666 (patch) | |
| tree | 5e676a57a9cdd797c5c26c20a071bd8623761bb2 | |
| parent | Merge branch 'hotfixes-v0.6.1' (diff) | |
| parent | Bump version (diff) | |
| download | synapse-b1a38c39add2fa6575ecb96072f3c5e556e96666.tar.xz | |
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse v0.6.1b
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/events/utils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/VERSION b/VERSION index 8b9dea59dc..3b3e723172 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1a +0.6.1b diff --git a/synapse/__init__.py b/synapse/__init__.py index 2195ad3177..e7e27b06ec 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.6.1a" +__version__ = "0.6.1b" diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 4f4914467c..4ad37188ba 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -98,7 +98,7 @@ def serialize_event(hs, e): d = {k: v for k, v in e.get_dict().items()} 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) |