Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

7e90fb6a

Commit 7e90fb6a authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

Merge branch 'develop' into daniel/roomcleanupincremental

Conflicts:
	synapse/rest/client/v1/room.py

parents 591af2d0 200de164

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/filtering.py 4 additions, 1 deletion

synapse/api/filtering.py
synapse/rest/client/v1/push_rule.py 1 addition, 1 deletion

synapse/rest/client/v1/push_rule.py
synapse/rest/client/v1/room.py 1 addition, 1 deletion

synapse/rest/client/v1/room.py
synapse/storage/push_rule.py 86 additions, 82 deletions

synapse/storage/push_rule.py

with 92 additions and 85 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