Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

0a666449

Commit 0a666449 authored 10 years ago by David Baker

Downloads
- Plain Diff

Merge branch 'master' into pushers

parents 4c7ad50f 88484f68

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 21 additions, 0 deletions

CHANGES.rst
VERSION 1 addition, 1 deletion

VERSION
contrib/jitsimeetbridge/unjingle/.swp 0 additions, 0 deletions

contrib/jitsimeetbridge/unjingle/.swp
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/config/_base.py 2 additions, 2 deletions

synapse/config/_base.py
synapse/config/logger.py 6 additions, 0 deletions

synapse/config/logger.py
synapse/config/server.py 5 additions, 2 deletions

synapse/config/server.py
synapse/federation/replication.py 6 additions, 2 deletions

synapse/federation/replication.py
synapse/handlers/presence.py 5 additions, 0 deletions

synapse/handlers/presence.py
synapse/handlers/room.py 5 additions, 1 deletion

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

synapse/rest/room.py
synapse/storage/roommember.py 3 additions, 1 deletion

synapse/storage/roommember.py
synapse/streams/config.py 5 additions, 1 deletion

synapse/streams/config.py

with 63 additions and 12 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