diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-15 16:37:32 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-15 16:37:32 +0100 |
commit | bcfb653816bc5a12f5bb55774cc2a0913aae69dd (patch) | |
tree | 486c983ec009886ff3ce3bfc5b6a0cf0f0445373 /synapse/appservice | |
parent | Remove unused constatns (diff) | |
parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
download | synapse-bcfb653816bc5a12f5bb55774cc2a0913aae69dd.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions