Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

14bc4ed5

Commit 14bc4ed5 authored 10 years ago by Kegan Dougal

Downloads
- Plain Diff

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

Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.

parents 0b8a3bc3 5bd9369a

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/events/__init__.py 13 additions, 0 deletions

synapse/api/events/__init__.py
synapse/api/events/factory.py 8 additions, 0 deletions

synapse/api/events/factory.py
synapse/federation/replication.py 12 additions, 3 deletions

synapse/federation/replication.py
synapse/handlers/events.py 4 additions, 6 deletions

synapse/handlers/events.py
synapse/handlers/message.py 3 additions, 3 deletions

synapse/handlers/message.py
synapse/handlers/room.py 1 addition, 1 deletion

synapse/handlers/room.py
synapse/rest/events.py 1 addition, 1 deletion

synapse/rest/events.py
synapse/rest/room.py 1 addition, 1 deletion

synapse/rest/room.py
synapse/server.py 4 additions, 0 deletions

synapse/server.py
synapse/storage/_base.py 4 additions, 0 deletions

synapse/storage/_base.py
webclient/recents/recents.html 1 addition, 1 deletion

webclient/recents/recents.html

with 52 additions and 16 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