diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-17 12:13:14 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-17 12:13:14 +0000 |
| commit | d8a05418f97827fd768a1abc540b204f9120d50f (patch) | |
| tree | 6827428a35bd8d65720b1cbd5bc2ba4f25d02eae /synapse | |
| parent | Merge pull request #2686 from matrix-org/luke/as-flair (diff) | |
| parent | Merge branch 'release-v0.25.1' (diff) | |
| download | synapse-d8a05418f97827fd768a1abc540b204f9120d50f.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 |