diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-26 13:49:38 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-26 13:49:38 +0100 |
| commit | 6f0c344ca7fd6e5dd6109d47ecdf90fa63f75f71 (patch) | |
| tree | 22fc258521ec6c2e46c84a1cd579deb2ca8a7cfb /synapse/api | |
| parent | Merge pull request #253 from matrix-org/tox (diff) | |
| parent | Merge erikj/user_dedup to develop (diff) | |
| download | synapse-6f0c344ca7fd6e5dd6109d47ecdf90fa63f75f71.tar.xz | |
Merge pull request #255 from matrix-org/mergeeriksmadness
Merge erikj/user_dedup to develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions