Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

47822fd2

Unverified Commit 47822fd2 authored 2 years ago by Brendan Abolivier

Downloads
- Plain Diff

Merge branch 'master' into develop

parents de70b25e 6fccd72f

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 11 additions, 2 deletions

CHANGES.md
debian/changelog 8 additions, 0 deletions

debian/changelog
debian/matrix-synapse-py3.postinst 1 addition, 1 deletion

debian/matrix-synapse-py3.postinst
debian/po/templates.pot 6 additions, 6 deletions

debian/po/templates.pot
debian/templates 7 additions, 6 deletions

debian/templates
docs/SUMMARY.md 1 addition, 1 deletion

docs/SUMMARY.md
docs/usage/administration/monitoring/reporting_homeserver_usage_statistics.md 4 additions, 4 deletions

...ation/monitoring/reporting_homeserver_usage_statistics.md
docs/usage/configuration/config_documentation.md 8 additions, 3 deletions

docs/usage/configuration/config_documentation.md
pyproject.toml 1 addition, 1 deletion

pyproject.toml
synapse/_scripts/generate_config.py 1 addition, 1 deletion

synapse/_scripts/generate_config.py
synapse/config/_base.py 7 additions, 7 deletions

synapse/config/_base.py

with 55 additions and 32 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