diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
| commit | 2d4d2bbae4f35e3128fa492e45cfc5b0750524bc (patch) | |
| tree | 8e3fa03a60443dc2a1af80d5fb13aa0e28ffddca /contrib | |
| parent | Write a default log_config when generating config (diff) | |
| parent | Add get_rooms_for_user cache (diff) | |
| download | synapse-2d4d2bbae4f35e3128fa492e45cfc5b0750524bc.tar.xz | |
Merge branch 'develop' into markjh/config_cleanup
Conflicts: synapse/config/captcha.py
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions