summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-18 18:38:06 +0000
committerErik Johnston <erik@matrix.org>2015-11-18 18:38:06 +0000
commit03204f54ac8b74f10b5a601b582a6f1e7c27d6d0 (patch)
tree5177b5e5a6975c5bd2b13ff83202b42b0453d9c0 /synapse/util
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentErik pointed out we should advise on the lack of included client (diff)
downloadsynapse-03204f54ac8b74f10b5a601b582a6f1e7c27d6d0.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions