diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-10-18 11:00:43 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-10-18 11:00:43 +0100 |
| commit | 1ee97cbd0198fcf87ba0257eae9b099cf25aa772 (patch) | |
| tree | 6b2a5552f42c17d60de14c8693fcf67ee714a706 /synapse | |
| parent | Merge pull request #6196 from matrix-org/erikj/await (diff) | |
| parent | Merge tag 'v1.4.1' (diff) | |
| download | synapse-1ee97cbd0198fcf87ba0257eae9b099cf25aa772.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |