diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
commit | 9c61556504924a063e7739ba80122c8753aed50c (patch) | |
tree | a483e292dfe602f30be1f9f17266a1bd0f88552d /demo | |
parent | Fix Formatting (diff) | |
parent | Merge pull request #36 from matrix-org/device_id_from_access_token (diff) | |
download | synapse-9c61556504924a063e7739ba80122c8753aed50c.tar.xz |
Merge branch 'develop' into client_v2_sync
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions