diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
| commit | c96d882a02924a26f69c75cb988b06f3015d7578 (patch) | |
| tree | 4b2fd1bea90831955841dfb33753ac553c439104 /synapse/__init__.py | |
| parent | Merge branch 'develop' into matthew/filter_members (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-c96d882a02924a26f69c75cb988b06f3015d7578.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |