summary refs log tree commit diff
path: root/synapse/visibility.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
committerErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
commit34101427417f58418a9587adfeca3d41898b5e24 (patch)
treef1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /synapse/visibility.py
parentUpdate changelog (diff)
parentMerge pull request #992 from matrix-org/erikj/psutil_conditional (diff)
downloadsynapse-34101427417f58418a9587adfeca3d41898b5e24.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/visibility.py')
0 files changed, 0 insertions, 0 deletions