Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

490b97d3

Commit 490b97d3 authored 8 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into release-v0.18.2

parents 665e5352 f9d5b60a

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 0 additions, 2 deletions

synapse/app/homeserver.py
synapse/metrics/__init__.py 6 additions, 0 deletions

synapse/metrics/__init__.py
synapse/metrics/process_collector.py 3 additions, 7 deletions

synapse/metrics/process_collector.py

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