Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

2a0ec3b8

Commit 2a0ec3b8 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into markjh/edu_frequency

Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py

parents ed0f79bd 03b2a6a8

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

README.rst 17 additions, 12 deletions

README.rst
scripts-dev/definitions.py 1 addition, 1 deletion

scripts-dev/definitions.py
synapse/config/server.py 1 addition, 0 deletions

synapse/config/server.py
synapse/handlers/events.py 15 additions, 5 deletions

synapse/handlers/events.py
synapse/handlers/federation.py 8 additions, 11 deletions

synapse/handlers/federation.py
synapse/handlers/message.py 6 additions, 4 deletions

synapse/handlers/message.py
synapse/handlers/presence.py 11 additions, 7 deletions

synapse/handlers/presence.py
synapse/handlers/profile.py 15 additions, 13 deletions

synapse/handlers/profile.py
synapse/handlers/register.py 8 additions, 4 deletions

synapse/handlers/register.py
synapse/handlers/room.py 15 additions, 9 deletions

synapse/handlers/room.py
synapse/handlers/search.py 12 additions, 3 deletions

synapse/handlers/search.py

with 109 additions and 69 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