summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorPaul Evans <leonerd@leonerd.org.uk>2017-01-25 18:15:19 +0000
committerGitHub <noreply@github.com>2017-01-25 18:15:19 +0000
commite978247fe560eafb8462d5f8e699ad6ff86b93c1 (patch)
tree7f64c1b2dda16d751a28223a7f3cc0f73910a795 /synapse/app/synchrotron.py
parentMerge branch 'erikj/current_state_fix' into develop (diff)
parentDon't clobber a displayname or avatar_url if provided by an m.room.member event (diff)
downloadsynapse-e978247fe560eafb8462d5f8e699ad6ff86b93c1.tar.xz
Merge pull request #1852 from matrix-org/paul/issue-1382
Don't clobber a displayname or avatar_url if provided by an m.room.member event
Diffstat (limited to 'synapse/app/synchrotron.py')
0 files changed, 0 insertions, 0 deletions