summary refs log tree commit diff
path: root/docs/README.rst
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-09-07 15:06:46 +0100
committerMark Haines <mark.haines@matrix.org>2015-09-07 15:06:46 +0100
commit73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch)
tree268463223a4dbed35244b83ffb7b767330f8416e /docs/README.rst
parentupdate logger to match new ambiguous script name... (diff)
parentDEPENDENCY_LINKS was turned to a list (diff)
downloadsynapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz
Merge branch 'master' into develop
Conflicts:
	setup.py
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions