summary refs log tree commit diff
path: root/scripts-dev/check_event_hash.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-07-27 15:11:02 +0100
committerMark Haines <mark.haines@matrix.org>2016-07-27 15:11:02 +0100
commit29b25d59c6de7da759f152fbcaba0e323a75af71 (patch)
tree508289fc88ee4b51b6c0bd5bd49538809f5a2bbf /scripts-dev/check_event_hash.py
parentClean up verify_json_objects_for_server (diff)
parentMerge pull request #955 from matrix-org/markjh/only_from2 (diff)
downloadsynapse-29b25d59c6de7da759f152fbcaba0e323a75af71.tar.xz
Merge branch 'develop' into markjh/verify
Conflicts:
	synapse/crypto/keyring.py
Diffstat (limited to 'scripts-dev/check_event_hash.py')
0 files changed, 0 insertions, 0 deletions