Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

57e0e619

Commit 57e0e619 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

Conflicts:
	tests/handlers/test_room.py

parents 616f8802 20beed9d

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 6 additions, 0 deletions

CHANGES.rst
VERSION 1 addition, 1 deletion

VERSION
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/config/_base.py 2 additions, 2 deletions

synapse/config/_base.py
synapse/handlers/room.py 7 additions, 0 deletions

synapse/handlers/room.py
synapse/handlers/typing.py 105 additions, 20 deletions

synapse/handlers/typing.py
synapse/media/v1/media_repository.py 5 additions, 5 deletions

synapse/media/v1/media_repository.py
synapse/media/v1/upload_resource.py 3 additions, 1 deletion

synapse/media/v1/upload_resource.py
synapse/rest/room.py 32 additions, 0 deletions

synapse/rest/room.py
tests/handlers/test_room.py 54 additions, 0 deletions

tests/handlers/test_room.py
tests/handlers/test_typing.py 118 additions, 22 deletions

tests/handlers/test_typing.py
tests/rest/test_rooms.py 0 additions, 4 deletions

tests/rest/test_rooms.py
tests/rest/test_typing.py 115 additions, 0 deletions

tests/rest/test_typing.py

with 449 additions and 56 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