summary refs log tree commit diff
path: root/synapse/config/tls.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-11-04 16:01:00 +0000
committerMark Haines <mark.haines@matrix.org>2015-11-04 16:01:00 +0000
commit33b3e0404937452a079be36b1cb7951cc17d221b (patch)
tree151b669f040baaaad81b4f79d2ccc619932595c1 /synapse/config/tls.py
parentRemove more unused parameters (diff)
parentMerge pull request #346 from matrix-org/markjh/remove_lock_manager (diff)
downloadsynapse-33b3e0404937452a079be36b1cb7951cc17d221b.tar.xz
Merge branch 'develop' into daniel/removesomelies
Conflicts:
	synapse/notifier.py
Diffstat (limited to 'synapse/config/tls.py')
0 files changed, 0 insertions, 0 deletions