summary refs log tree commit diff
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-17 15:53:59 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-17 15:53:59 +0000
commit7e90fb6a5728d223c6597f19194188a9f1e438ad (patch)
tree7d0ce13361eb03526251fdfe4dc32ed3d6ab5104 /MANIFEST.in
parentSome cleanup (diff)
parentMerge pull request #580 from Rugvip/develop (diff)
downloadsynapse-7e90fb6a5728d223c6597f19194188a9f1e438ad.tar.xz
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts:
	synapse/rest/client/v1/room.py
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions