diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-03 16:08:48 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-03 16:08:48 +0000 |
commit | 8a0407c7e6b43a9e36dfaed228442cc8fb1361bd (patch) | |
tree | 82e7a8610cb4f15094b23d6e3e0467f512390d04 /synapse/http/matrixfederationclient.py | |
parent | Surely we don't need to preserve 'events_default' twice (diff) | |
parent | Merge pull request #338 from matrix-org/daniel/fixdb (diff) | |
download | synapse-8a0407c7e6b43a9e36dfaed228442cc8fb1361bd.tar.xz |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
0 files changed, 0 insertions, 0 deletions