diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
| commit | b8d49be5a1d8719ec47a44547d043874c8bfaddc (patch) | |
| tree | 52e58244f968f10176f8624eac19452d3337f810 /demo/stop.sh | |
| parent | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... (diff) | |
| parent | Merge pull request #172 from intelfx/contrib-systemd (diff) | |
| download | synapse-b8d49be5a1d8719ec47a44547d043874c8bfaddc.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/python_dependencies.py
Diffstat (limited to 'demo/stop.sh')
0 files changed, 0 insertions, 0 deletions