diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:04:53 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:04:53 +0000 |
commit | 875a481a1ee055ece27ddc31906cc37bc7983dcd (patch) | |
tree | 29c75f4dd4e5d9f356937c50395a0af5fba4200b /synapse/media/v1/upload_resource.py | |
parent | Add support for storing rejected events in EventContext and data stores (diff) | |
parent | Remove commented line (diff) | |
download | synapse-875a481a1ee055ece27ddc31906cc37bc7983dcd.tar.xz |
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
Diffstat (limited to 'synapse/media/v1/upload_resource.py')
0 files changed, 0 insertions, 0 deletions