diff options
| author | Paul Evans <leonerd@leonerd.org.uk> | 2017-01-25 18:15:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 18:15:19 +0000 |
| commit | e978247fe560eafb8462d5f8e699ad6ff86b93c1 (patch) | |
| tree | 7f64c1b2dda16d751a28223a7f3cc0f73910a795 /synapse/storage/_base.py | |
| parent | Merge branch 'erikj/current_state_fix' into develop (diff) | |
| parent | Don't clobber a displayname or avatar_url if provided by an m.room.member event (diff) | |
| download | synapse-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/storage/_base.py')
0 files changed, 0 insertions, 0 deletions