Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

d685ae73

Commit d685ae73 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop

parents f92fe158 8f9c74e9

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/filtering.py 27 additions, 21 deletions

synapse/api/filtering.py
synapse/rest/client/v2_alpha/filter.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/filter.py
synapse/rest/client/v2_alpha/sync.py 12 additions, 12 deletions

synapse/rest/client/v2_alpha/sync.py
tests/api/test_filtering.py 1 addition, 1 deletion

tests/api/test_filtering.py

with 41 additions and 35 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