diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-27 11:58:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-27 11:58:32 +0000 |
| commit | ad9226eeec87f1e5e3886c4dd599f89e7577d5a5 (patch) | |
| tree | 602250011e5528be426aa8965164e707ea978cbc /webclient/media | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho... (diff) | |
| parent | fix pyflakes warnings (diff) | |
| download | synapse-ad9226eeec87f1e5e3886c4dd599f89e7577d5a5.tar.xz | |
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'webclient/media')
0 files changed, 0 insertions, 0 deletions