summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:28:36 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:28:36 +0100
commitce2a7ed6e435cba44df386e718cdccecc119d333 (patch)
treeaa73f75d9ba9c70fdbb18ecf6d9237889f154933 /synapse/python_dependencies.py
parentMerge branch 'develop' into auth (diff)
parentMerge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-ce2a7ed6e435cba44df386e718cdccecc119d333.tar.xz
Merge branch 'develop' into auth
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions