Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

23ed7dc0

Commit 23ed7dc0 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 12122bfc 315b03b5

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/_base.py 46 additions, 0 deletions

synapse/handlers/_base.py
synapse/handlers/message.py 4 additions, 50 deletions

synapse/handlers/message.py
synapse/handlers/sync.py 1 addition, 47 deletions

synapse/handlers/sync.py

with 51 additions and 97 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