diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-13 16:21:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-13 16:21:30 +0000 |
| commit | 5f68529036d7d2bd6b7e5c67250a722a10c094f2 (patch) | |
| tree | d65cb2872ab8d5e7d8649025b3078acc6281598d /synapse/appservice/api.py | |
| parent | Merge branch 'hotfixes-0.7.0e' into develop (diff) | |
| parent | Merge branch 'hotfixes-0.7.0e' of github.com:matrix-org/synapse (diff) | |
| download | synapse-5f68529036d7d2bd6b7e5c67250a722a10c094f2.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/appservice/api.py')
0 files changed, 0 insertions, 0 deletions