summary refs log tree commit diff
path: root/jenkins
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-11-07 13:49:27 +0000
committerGitHub <noreply@github.com>2017-11-07 13:49:27 +0000
commit5ef5e14ecce9944dffd3de0f565393890cf9838d (patch)
tree53d29f6177a8a46e6d2471e1c7cad8e84d66a285 /jenkins
parentRevert "Merge branch 'master' of github.com:matrix-org/synapse into develop" (diff)
parentremoved unused import flagged by flake8a (diff)
downloadsynapse-5ef5e14ecce9944dffd3de0f565393890cf9838d.tar.xz
Merge pull request #2636 from farialima/me-master
Fix for #2635: correctly update rooms avatar/display name when modified by admin
Diffstat (limited to 'jenkins')
0 files changed, 0 insertions, 0 deletions