Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

e9f587ec

Commit e9f587ec authored 10 years ago by Paul "LeoNerd" Evans

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into room-initial-sync

parents 33d328d9 3553101e

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

README.rst 87 additions, 86 deletions

README.rst
synapse/api/auth.py 22 additions, 3 deletions

synapse/api/auth.py
synapse/app/homeserver.py 37 additions, 24 deletions

synapse/app/homeserver.py
synapse/app/synctl.py 1 addition, 1 deletion

synapse/app/synctl.py
synapse/handlers/directory.py 6 additions, 14 deletions

synapse/handlers/directory.py
synapse/handlers/room.py 36 additions, 31 deletions

synapse/handlers/room.py
synapse/rest/directory.py 3 additions, 1 deletion

synapse/rest/directory.py
synapse/storage/directory.py 17 additions, 7 deletions

synapse/storage/directory.py

with 209 additions and 167 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