Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d2f3ef98

Unverified Commit d2f3ef98 authored 6 years ago by Neil Johnson Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'develop' into neilj/disable_hs

parents 54685d29 cc187deb

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3662.feature 1 addition, 0 deletions

changelog.d/3662.feature
synapse/app/homeserver.py 6 additions, 0 deletions

synapse/app/homeserver.py
synapse/config/server.py 3 additions, 0 deletions

synapse/config/server.py
synapse/storage/monthly_active_users.py 45 additions, 6 deletions

synapse/storage/monthly_active_users.py
tests/storage/test_monthly_active_users.py 58 additions, 1 deletion

tests/storage/test_monthly_active_users.py
tests/utils.py 2 additions, 0 deletions

tests/utils.py

with 115 additions and 7 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