diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-22 15:57:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-22 15:57:26 +0000 |
commit | c2f976874060c7b6e6410effea94df3174f9eacd (patch) | |
tree | e469e8230f1b8a2f2787f39e0584b1659cbb7431 /synapse/media | |
parent | Add support for storing rejected events in EventContext and data stores (diff) | |
parent | fix pyflakes (diff) | |
download | synapse-c2f976874060c7b6e6410effea94df3174f9eacd.tar.xz |
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections
Diffstat (limited to 'synapse/media')
0 files changed, 0 insertions, 0 deletions