summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 14:56:45 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 14:56:45 +0100
commitbd92c8eaa7a5aefaa4d349b01be2f5d24650caa1 (patch)
treee8dada64c477da129aa2063cc20feb658f11a832 /synapse/handlers/room.py
parentMerge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... (diff)
parentUpdate register.py (diff)
downloadsynapse-bd92c8eaa7a5aefaa4d349b01be2f5d24650caa1.tar.xz
Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/handlers/room.py')
0 files changed, 0 insertions, 0 deletions