summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-17 12:39:48 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-17 12:39:48 +0100
commitda5ef0bb424fb3f68c1222e8cde053a0a6640586 (patch)
tree6fc07dace9766357207e3d17e60ed15abcf898e2 /docker
parentMerge pull request #5196 from matrix-org/babolivier/per_room_profiles (diff)
parentStop telling people to install the optional dependencies. (#5197) (diff)
downloadsynapse-da5ef0bb424fb3f68c1222e8cde053a0a6640586.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions