diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
| commit | ab34fdecb777b057a0ec307328f309bb2bdee05c (patch) | |
| tree | 541dc61435b893897e7a46d8f0a69443e18233d7 /synapse/api | |
| parent | Add some TODOs (diff) | |
| parent | Merge pull request #1041 from matrix-org/paul/third-party-lookup (diff) | |
| download | synapse-ab34fdecb777b057a0ec307328f309bb2bdee05c.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions