summary refs log tree commit diff
path: root/synapse/rest/voip.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:04:53 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:04:53 +0000
commit875a481a1ee055ece27ddc31906cc37bc7983dcd (patch)
tree29c75f4dd4e5d9f356937c50395a0af5fba4200b /synapse/rest/voip.py
parentAdd support for storing rejected events in EventContext and data stores (diff)
parentRemove commented line (diff)
downloadsynapse-875a481a1ee055ece27ddc31906cc37bc7983dcd.tar.xz
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
Diffstat (limited to 'synapse/rest/voip.py')
0 files changed, 0 insertions, 0 deletions