diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-09 16:57:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-09 16:57:33 +0100 |
| commit | 16a88842334806111f4e52cfdcdcf2d8069a559f (patch) | |
| tree | 6ef6a66d1e510fe14508b82c08624adad5f064b2 /synapse | |
| parent | Merge pull request #862 from matrix-org/erikj/media_remote_error (diff) | |
| parent | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-16a88842334806111f4e52cfdcdcf2d8069a559f.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse 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 |