Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

f7626939

Commit f7626939 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

Conflicts:
	synapse/state.py

parents 52f99243 56db4650

No related branches found

No related tags found

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/logger.py 1 addition, 1 deletion

synapse/config/logger.py
synapse/events/__init__.py 11 additions, 11 deletions

synapse/events/__init__.py
synapse/handlers/_base.py 3 additions, 10 deletions

synapse/handlers/_base.py
synapse/handlers/directory.py 0 additions, 1 deletion

synapse/handlers/directory.py
synapse/handlers/federation.py 6 additions, 15 deletions

synapse/handlers/federation.py
synapse/handlers/message.py 0 additions, 38 deletions

synapse/handlers/message.py
synapse/handlers/typing.py 2 additions, 2 deletions

synapse/handlers/typing.py
synapse/media/v1/base_resource.py 1 addition, 0 deletions

synapse/media/v1/base_resource.py
synapse/rest/room.py 5 additions, 3 deletions

synapse/rest/room.py
synapse/rest/transactions.py 1 addition, 0 deletions

synapse/rest/transactions.py
synapse/state.py 10 additions, 70 deletions

synapse/state.py
synapse/storage/__init__.py 0 additions, 80 deletions

synapse/storage/__init__.py
tests/handlers/test_federation.py 8 additions, 10 deletions

tests/handlers/test_federation.py
tests/handlers/test_room.py 18 additions, 12 deletions

tests/handlers/test_room.py
tests/test_state.py 33 additions, 69 deletions

tests/test_state.py

with 99 additions and 322 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