Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

1660145a

Commit 1660145a authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 3c5f2550 7f79a640

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/events/__init__.py 3 additions, 1 deletion

synapse/events/__init__.py
synapse/handlers/directory.py 47 additions, 6 deletions

synapse/handlers/directory.py
synapse/rest/client/v1/directory.py 2 additions, 1 deletion

synapse/rest/client/v1/directory.py
synapse/storage/events.py 12 additions, 14 deletions

synapse/storage/events.py

with 64 additions and 22 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