Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

05e62e04

Commit 05e62e04 authored 7 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 97359ca4 7239258a

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

README.rst 19 additions, 0 deletions

README.rst
docs/metrics-howto.rst 2 additions, 3 deletions

docs/metrics-howto.rst
synapse/push/bulk_push_rule_evaluator.py 5 additions, 1 deletion

synapse/push/bulk_push_rule_evaluator.py
synapse/rest/client/v1/room.py 7 additions, 1 deletion

synapse/rest/client/v1/room.py
synapse/storage/roommember.py 16 additions, 8 deletions

synapse/storage/roommember.py
synapse/storage/state.py 4 additions, 3 deletions

synapse/storage/state.py
synapse/util/stringutils.py 14 additions, 0 deletions

synapse/util/stringutils.py

with 67 additions and 16 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