Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8346e6e6

Commit 8346e6e6 authored 7 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents a2c89a22 e4c15fcb

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/events/snapshot.py 3 additions, 0 deletions

synapse/events/snapshot.py
synapse/handlers/message.py 8 additions, 2 deletions

synapse/handlers/message.py
synapse/handlers/room_member.py 1 addition, 0 deletions

synapse/handlers/room_member.py
synapse/rest/client/v1/room.py 1 addition, 0 deletions

synapse/rest/client/v1/room.py
synapse/storage/events.py 18 additions, 0 deletions

synapse/storage/events.py
synapse/util/__init__.py 1 addition, 1 deletion

synapse/util/__init__.py
tests/storage/event_injector.py 2 additions, 2 deletions

tests/storage/event_injector.py
tests/storage/test_events.py 1 addition, 1 deletion

tests/storage/test_events.py

with 35 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