diff options
author | Erik Johnston <erik@matrix.org> | 2016-02-01 15:59:12 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-02-01 15:59:12 +0000 |
commit | 1ef7cae41b4984f84591a19b0d38f03cfcb1ff0f (patch) | |
tree | 2655f4c8f789d5e68448b9239a56e4cac7c209fc /synapse/handlers/appservice.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync (diff) | |
parent | Merge pull request #543 from matrix-org/erikj/sync (diff) | |
download | synapse-1ef7cae41b4984f84591a19b0d38f03cfcb1ff0f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'synapse/handlers/appservice.py')
0 files changed, 0 insertions, 0 deletions