diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-22 11:49:12 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-22 11:49:12 +0000 |
commit | 542ab0f88661e1d737dfc604332ae841932dfbbb (patch) | |
tree | 856098a377bb701928d21d2b50d4ac808bd7c306 /synapse/appservice | |
parent | Allow guest access to /sync (diff) | |
parent | Merge pull request #453 from matrix-org/daniel/avatarurls (diff) | |
download | synapse-542ab0f88661e1d737dfc604332ae841932dfbbb.tar.xz |
Merge branch 'develop' into markjh/guest_access
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions