diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-26 13:14:59 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-26 13:14:59 +0000 |
| commit | 14ff33bd93152027990bb7d961e0be98bf1c26b5 (patch) | |
| tree | 96092b7759947da81d12450ad49c712d845cf02d /scripts | |
| parent | Add client v2_alpha resource to synapse server resource tree (diff) | |
| parent | Add client v2_alpha resource to synapse server resource tree (diff) | |
| download | synapse-14ff33bd93152027990bb7d961e0be98bf1c26b5.tar.xz | |
Merge branch 'develop' into client_v2_sync
Conflicts: synapse/rest/client/v2_alpha/__init__.py
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions