summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 14:30:26 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 14:30:26 +0000
commit91f0e411533b2cd6b120d7f5fbe0c558a105bdcb (patch)
treeb542074da8ec84541ad8dcb7b52db7e5aad66ba7 /synapse/python_dependencies.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentyaml.load expects strings to be a yaml rather than file (diff)
downloadsynapse-91f0e411533b2cd6b120d7f5fbe0c558a105bdcb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions