summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-11 14:10:55 +0100
committerGitHub <noreply@github.com>2016-08-11 14:10:55 +0100
commit832799dbff31d085733ea56c54bcb8aab8799366 (patch)
tree5b61045e8c7174cb178b1f1b48de42e6d69ca67c /res
parentMerge pull request #1003 from matrix-org/erikj/redaction_prev_content (diff)
parentSynced up synchrotron set_state with PresenceHandler set_state (diff)
downloadsynapse-832799dbff31d085733ea56c54bcb8aab8799366.tar.xz
Merge pull request #997 from Half-Shot/develop
Don't change status_msg on /sync
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions