diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-11 14:10:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 14:10:55 +0100 |
| commit | 832799dbff31d085733ea56c54bcb8aab8799366 (patch) | |
| tree | 5b61045e8c7174cb178b1f1b48de42e6d69ca67c /synapse/app | |
| parent | Merge pull request #1003 from matrix-org/erikj/redaction_prev_content (diff) | |
| parent | Synced up synchrotron set_state with PresenceHandler set_state (diff) | |
| download | synapse-832799dbff31d085733ea56c54bcb8aab8799366.tar.xz | |
Merge pull request #997 from Half-Shot/develop
Don't change status_msg on /sync
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/synchrotron.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 215ccfd522..48bc97636c 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -119,7 +119,7 @@ class SynchrotronPresence(object): reactor.addSystemEventTrigger("before", "shutdown", self._on_shutdown) - def set_state(self, user, state): + def set_state(self, user, state, ignore_status_msg=False): # TODO Hows this supposed to work? pass |