Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

44c9102e

Commit 44c9102e authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/listeners_config' into erikj/sanitize_logging

parents f00f8346 9d0326ba

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 189 additions, 159 deletions

synapse/app/homeserver.py
synapse/config/captcha.py 0 additions, 8 deletions

synapse/config/captcha.py
synapse/config/metrics.py 0 additions, 6 deletions

synapse/config/metrics.py
synapse/config/server.py 136 additions, 27 deletions

synapse/config/server.py
synapse/server.py 2 additions, 10 deletions

synapse/server.py
tests/utils.py 2 additions, 0 deletions

tests/utils.py

with 329 additions and 210 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment