diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-18 15:07:03 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-18 15:07:03 +0100 |
| commit | c632bc865448b40d246878e2d6c9287621b4ba0e (patch) | |
| tree | d126c9cba47f70f40cee6acebac8f1cf93599e66 /synapse/handlers | |
| parent | Merge pull request #4049 from matrix-org/erikj/synctl_colour (diff) | |
| parent | 0.33.7 (diff) | |
| download | synapse-c632bc865448b40d246878e2d6c9287621b4ba0e.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/handlers')
0 files changed, 0 insertions, 0 deletions