diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-05-17 12:39:48 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-05-17 12:39:48 +0100 |
commit | da5ef0bb424fb3f68c1222e8cde053a0a6640586 (patch) | |
tree | 6fc07dace9766357207e3d17e60ed15abcf898e2 /synapse | |
parent | Merge pull request #5196 from matrix-org/babolivier/per_room_profiles (diff) | |
parent | Stop telling people to install the optional dependencies. (#5197) (diff) | |
download | synapse-da5ef0bb424fb3f68c1222e8cde053a0a6640586.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions