Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

357dd187

Commit 357dd187 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into storage_transactions

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py

parents 2aeaa7b7 e111a06e

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

setup.py 2 additions, 0 deletions

setup.py
synapse/handlers/_base.py 1 addition, 1 deletion

synapse/handlers/_base.py
synapse/notifier.py 5 additions, 1 deletion

synapse/notifier.py
tests/handlers/test_federation.py 1 addition, 2 deletions

tests/handlers/test_federation.py
tests/handlers/test_room.py 2 additions, 3 deletions

tests/handlers/test_room.py

with 11 additions and 7 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