summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorMatrix <matrix@matrix.org>2017-01-01 13:55:13 +0000
committerMatrix <matrix@matrix.org>2017-01-01 13:55:13 +0000
commit7ed07066ace768cb71462cf08f8613ec7b0effbb (patch)
tree0af4b1c5b63c7a41c2a5fe8df3c9f2883407d1e1 /synapse/state.py
parentMerge branch 'markjh/fix_get_missing' into matrix-org-hotfixes (diff)
parents/aquire/acquire/g (diff)
downloadsynapse-7ed07066ace768cb71462cf08f8613ec7b0effbb.tar.xz
Merge branch 'markjh/linearizer_logging' into matrix-org-hotfixes
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions