diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-06 14:50:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-06 14:50:22 +0100 |
| commit | eef7778af979827ee7e16b7402529780cc424c57 (patch) | |
| tree | 13dbf63f60d8bc66a826566299e8201d936238fd /MAP.rst | |
| parent | Merge branch 'erikj/shared_secret' into erikj/test2 (diff) | |
| parent | Merge pull request #909 from matrix-org/erikj/shared_secret (diff) | |
| download | synapse-eef7778af979827ee7e16b7402529780cc424c57.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions