diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 11:03:47 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 11:03:47 +0100 |
commit | ade5342752498867140630f014c692787cbbedc9 (patch) | |
tree | 1741b76d4e4f06c81ff290c688d196a51d020fd5 /synapse/streams | |
parent | Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms (diff) | |
parent | Merge branch 'develop' into auth (diff) | |
download | synapse-ade5342752498867140630f014c692787cbbedc9.tar.xz |
Merge branch 'auth' into refresh
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions