diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
| commit | 05aee12652e687adf8926314a69362b5a7183d5e (patch) | |
| tree | 0cf5695e5042ab107065489b07a695c707b837f8 /synapse/util/__init__.py | |
| parent | Allow guest users access to messages in rooms they have joined (diff) | |
| parent | Add presence metric (diff) | |
| download | synapse-05aee12652e687adf8926314a69362b5a7183d5e.tar.xz | |
Merge branch 'develop' into rav/guest_access_after_room_join
Diffstat (limited to 'synapse/util/__init__.py')
| -rw-r--r-- | synapse/util/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 133671e238..3b9da5b34a 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -42,7 +42,7 @@ class Clock(object): def time_msec(self): """Returns the current system time in miliseconds since epoch.""" - return self.time() * 1000 + return int(self.time() * 1000) def looping_call(self, f, msec): l = task.LoopingCall(f) |