Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

3186c5bd

Commit 3186c5bd authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into client_v2_sync

parents 0cfb4591 9b6aaf20

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/events/utils.py 6 additions, 6 deletions

synapse/events/utils.py
synapse/handlers/events.py 4 additions, 1 deletion

synapse/handlers/events.py
synapse/handlers/message.py 15 additions, 6 deletions

synapse/handlers/message.py
synapse/handlers/room.py 5 additions, 2 deletions

synapse/handlers/room.py
synapse/rest/client/v1/events.py 7 additions, 1 deletion

synapse/rest/client/v1/events.py
synapse/rest/client/v1/room.py 8 additions, 1 deletion

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

synapse/server.py
tests/rest/client/v2_alpha/__init__.py 15 additions, 0 deletions

tests/rest/client/v2_alpha/__init__.py

with 60 additions and 21 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