diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-03 17:40:42 +0100 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-03 17:40:42 +0100 |
commit | 9705706a7fbddc052589e71bd0cd2448b886eb57 (patch) | |
tree | 0fae0f205af4f2f405e4d92febdf79f585c9011d /synapse/storage/presence.py | |
parent | Rename 'mtime' DB field to 'last_active', adjusted semantics (diff) | |
parent | Default PID file should be 'homeserver.pid' to match the other 'homeserver.*'... (diff) | |
download | synapse-9705706a7fbddc052589e71bd0cd2448b886eb57.tar.xz |
Merge branch 'develop' into paul/schema_breaking_changes
Diffstat (limited to 'synapse/storage/presence.py')
-rw-r--r-- | synapse/storage/presence.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py index 0d628a3c8d..67f5bf54d0 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 matrix.org +# Copyright 2014 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |