diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-10-22 20:27:25 +0200 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-10-22 20:27:25 +0200 |
| commit | 9498cd3e7b6166b1f3a61f828c79036def7a4aae (patch) | |
| tree | 784b1b17bbcdeb498f1cb51114dd2d0b6b3bebd2 /synapse/rest/client/v2_alpha/user_directory.py | |
| parent | merge in master (diff) | |
| download | synapse-9498cd3e7b6166b1f3a61f828c79036def7a4aae.tar.xz | |
fix conflict and reinstate 6372dff771413c2b9cd5648cbb6de01a679ef801
Diffstat (limited to 'synapse/rest/client/v2_alpha/user_directory.py')
0 files changed, 0 insertions, 0 deletions