diff options
author | Erik Johnston <erik@matrix.org> | 2016-05-09 13:21:06 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-05-09 13:21:06 +0100 |
commit | c9eb6dfc1bceb3a7fe9e5cb599df9ba8a05ff839 (patch) | |
tree | e6791617720f3d92c417afd97d382eadb2123242 /synapse/federation | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user (diff) | |
parent | Merge pull request #773 from matrix-org/erikj/get_domian_from_id (diff) | |
download | synapse-c9eb6dfc1bceb3a7fe9e5cb599df9ba8a05ff839.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions