diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 11:14:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 11:14:33 +0000 |
| commit | 2c9e136d5721d1797e153268f4562c27887a6201 (patch) | |
| tree | 8befee5ce84393b2a928ce909e2fa28ab1a09282 /synapse/federation | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into rejections (diff) | |
| download | synapse-2c9e136d5721d1797e153268f4562c27887a6201.tar.xz | |
Fix bad merge fo python_dependencies.py
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions