summary refs log tree commit diff
path: root/synapse/federation/__init__.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2017-01-24 18:06:07 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2017-01-24 18:06:07 +0000
commit10e48d83107492ebf872f8cd8051b95c35adc9f3 (patch)
tree7f64c1b2dda16d751a28223a7f3cc0f73910a795 /synapse/federation/__init__.py
parentMerge branch 'erikj/current_state_fix' into develop (diff)
downloadsynapse-10e48d83107492ebf872f8cd8051b95c35adc9f3.tar.xz
Don't clobber a displayname or avatar_url if provided by an m.room.member event
Diffstat (limited to 'synapse/federation/__init__.py')
0 files changed, 0 insertions, 0 deletions