summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:33:58 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:33:58 +0100
commitdc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch)
tree22d02a68df93c3f98b0be7de8a07040268420369 /synapse/state.py
parentRename 'meta' to 'unsigned' (diff)
parentkeep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff)
downloadsynapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz
Merge branch 'develop' into event_signing
Conflicts:
	synapse/federation/replication.py
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions