Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

74ee4048

Commit 74ee4048 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf

parents d61109f5 420ccfc9

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 6 additions, 0 deletions

CHANGES.rst
synapse/handlers/profile.py 4 additions, 2 deletions

synapse/handlers/profile.py
tests/handlers/test_presencelike.py 8 additions, 3 deletions

tests/handlers/test_presencelike.py
tests/handlers/test_profile.py 8 additions, 1 deletion

tests/handlers/test_profile.py

with 26 additions and 6 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