diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
commit | 2f6ad79a80a167b094e4ecd1894bae9b1cd15675 (patch) | |
tree | ea04c29e90a9335f6a4bfa199e9f4b4adfdc9ded /synapse/handlers/admin.py | |
parent | Pull out sender when computing search results (diff) | |
parent | Docs (diff) | |
download | synapse-2f6ad79a80a167b094e4ecd1894bae9b1cd15675.tar.xz |
Merge branch 'erikj/context_api' into erikj/search
Diffstat (limited to 'synapse/handlers/admin.py')
0 files changed, 0 insertions, 0 deletions