summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-06-10 13:02:48 +0100
committerGitHub <noreply@github.com>2016-06-10 13:02:48 +0100
commite9892b4b2681d961c486daeda52457d881054f2f (patch)
tree829dd38b3f07c0b1b742ba1a1810fd1731711566 /synapse/config/server.py
parentMerge pull request #863 from matrix-org/markjh/load_config (diff)
parentChange /bin/bash to /bin/sh in tox.ini (diff)
downloadsynapse-e9892b4b2681d961c486daeda52457d881054f2f.tar.xz
Merge pull request #866 from bartekrutkowski/develop
Change /bin/bash to /bin/sh in tox.ini
Diffstat (limited to 'synapse/config/server.py')
0 files changed, 0 insertions, 0 deletions