diff options
author | Erik Johnston <erik@matrix.org> | 2015-08-21 12:51:14 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-08-21 12:51:14 +0100 |
commit | 5dbd10247055dd6c216503b69902a6e235fcb7e8 (patch) | |
tree | f0e05422ef4f880b9b4f4eeece4624feffd3b528 /synapse/http/__init__.py | |
parent | Fix bug where we didn't correctly serialize the redacted_because key over fed... (diff) | |
parent | Doc string (diff) | |
download | synapse-5dbd10247055dd6c216503b69902a6e235fcb7e8.tar.xz |
Merge branch 'erikj/user_dedup' into release-v0.10.0
Diffstat (limited to 'synapse/http/__init__.py')
0 files changed, 0 insertions, 0 deletions