summary refs log tree commit diff
path: root/synapse/server.pyi
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-03-20 14:25:31 +0000
committerNeil Johnson <neil@fragile.org.uk>2018-03-20 14:25:31 +0000
commite66fbcbb02d98a0d165f3c5d4642d26add233562 (patch)
tree01b5c79c3951f31d5826a852f49aa312d8e47604 /synapse/server.pyi
parentUpdate __init__.py (diff)
parentMerge pull request #3005 from matrix-org/erikj/fix_cache_size (diff)
downloadsynapse-e66fbcbb02d98a0d165f3c5d4642d26add233562.tar.xz
fix merge conflicts
Diffstat (limited to 'synapse/server.pyi')
0 files changed, 0 insertions, 0 deletions