Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

cddf91c8

Commit cddf91c8 authored 6 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents c0e08dc4 1e5280b7

No related branches found

Tags v0.18.2-rc1

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

scripts-dev/nuke-room-from-db.sh 12 additions, 2 deletions

scripts-dev/nuke-room-from-db.sh
synapse/metrics/metric.py 3 additions, 2 deletions

synapse/metrics/metric.py
synapse/rest/client/v2_alpha/notifications.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/notifications.py
synapse/storage/stream.py 6 additions, 5 deletions

synapse/storage/stream.py

with 22 additions and 10 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