diff options
author | Erik Johnston <erik@matrix.org> | 2016-10-05 17:06:55 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-10-05 17:06:55 +0100 |
commit | 503c0ab78b745e4b8789d2989b9ab9c336eff2b7 (patch) | |
tree | 670e728c9dea2662c04ccd5bfa0b7288065cad36 /synapse/handlers/search.py | |
parent | Merge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brand (diff) | |
parent | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff) | |
download | synapse-503c0ab78b745e4b8789d2989b9ab9c336eff2b7.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/search.py')
0 files changed, 0 insertions, 0 deletions