diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
| commit | cde840a82c9397f9f880102520d0193462efc13f (patch) | |
| tree | 7e875e0514fd8db28244ba813927d293c4cb7929 /synapse/federation | |
| parent | Fix replication tests (diff) | |
| parent | Merge pull request #23 from matrix-org/media_repository (diff) | |
| download | synapse-cde840a82c9397f9f880102520d0193462efc13f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: setup.py
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions