summary refs log tree commit diff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-06-01 10:56:05 +0100
committerMark Haines <mark.haines@matrix.org>2015-06-01 10:56:05 +0100
commitb8d49be5a1d8719ec47a44547d043874c8bfaddc (patch)
tree52e58244f968f10176f8624eac19452d3337f810 /CONTRIBUTING.rst
parentUse Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... (diff)
parentMerge pull request #172 from intelfx/contrib-systemd (diff)
downloadsynapse-b8d49be5a1d8719ec47a44547d043874c8bfaddc.tar.xz
Merge branch 'develop' into markjh/twisted-15
Conflicts:
	synapse/python_dependencies.py
Diffstat (limited to 'CONTRIBUTING.rst')
0 files changed, 0 insertions, 0 deletions