Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d61109f5

Commit d61109f5 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 41ce544a efd27ff0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

README.rst 31 additions, 0 deletions

README.rst
setup.py 2 additions, 2 deletions

setup.py
synapse/events/utils.py 3 additions, 0 deletions

synapse/events/utils.py
synapse/handlers/directory.py 1 addition, 1 deletion

synapse/handlers/directory.py
synapse/handlers/message.py 9 additions, 2 deletions

synapse/handlers/message.py
synapse/handlers/room.py 8 additions, 1 deletion

synapse/handlers/room.py
synapse/media/v1/thumbnail_resource.py 14 additions, 5 deletions

synapse/media/v1/thumbnail_resource.py
synapse/storage/room.py 4 additions, 4 deletions

synapse/storage/room.py

with 72 additions and 15 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