diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 15:16:38 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 15:16:38 +0000 |
| commit | 1bd540ef7943c08e350ba24c407f152016fa6064 (patch) | |
| tree | 47f2f0cbc07a943fbdd8d154b6d88ace246e4787 /synapse/python_dependencies.py | |
| parent | Merge branch 'replication_split' of github.com:matrix-org/synapse into reject... (diff) | |
| parent | Merge pull request #42 from matrix-org/replication_split (diff) | |
| download | synapse-1bd540ef7943c08e350ba24c407f152016fa6064.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/schema/im.sql
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions