Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6ba2e3df

Commit 6ba2e3df authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 427bcb76 1352ae2c

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

contrib/scripts/kick_users.py 93 additions, 0 deletions

contrib/scripts/kick_users.py
synapse/api/auth.py 10 additions, 13 deletions

synapse/api/auth.py
synapse/handlers/typing.py 14 additions, 2 deletions

synapse/handlers/typing.py
tests/handlers/test_typing.py 19 additions, 6 deletions

tests/handlers/test_typing.py
tests/rest/client/v1/test_typing.py 5 additions, 2 deletions

tests/rest/client/v1/test_typing.py

with 141 additions and 23 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