Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

9db24769

Commit 9db24769 authored 6 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact

parents 69f7f141 48b04c4a

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3756.bugfix 1 addition, 0 deletions

changelog.d/3756.bugfix
synapse/server_notices/resource_limits_server_notices.py 3 additions, 4 deletions

synapse/server_notices/resource_limits_server_notices.py
tests/server_notices/test_resource_limits_server_notices.py 1 addition, 0 deletions

tests/server_notices/test_resource_limits_server_notices.py

with 5 additions and 4 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