diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 15:55:58 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 15:55:58 +0000 |
| commit | cf7c54ec93a733ab8d46d60f907e57ca1cec602f (patch) | |
| tree | b6e09bc7b23982501cb49bb3817413a29ffd4600 /synapse/server.py | |
| parent | Merge branch 'client_v2_filter' into client_v2_sync (diff) | |
| parent | Merge in auth changes from develop (diff) | |
| download | synapse-cf7c54ec93a733ab8d46d60f907e57ca1cec602f.tar.xz | |
Merge branch 'client_v2_filter' into client_v2_sync
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions