diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 10:24:32 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 10:24:32 -0500 |
| commit | 7c809abe8610826b09a23b44b1d2bb2ba572ef36 (patch) | |
| tree | bb0dfa368002a77caa3ffdd010877bffabcfe6a4 /synapse/crypto | |
| parent | Remove merge thinko (diff) | |
| parent | Merge pull request #292 from matrix-org/daniel/useragent (diff) | |
| download | synapse-7c809abe8610826b09a23b44b1d2bb2ba572ef36.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions