summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-10-15 11:51:55 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-10-15 11:51:55 +0100
commitf38df51e8dd8e462871c9bfb8fb49a89d157bf2d (patch)
tree08736d0f751f3ee3ee8f0c8f7b1cbce5de5569a7 /setup.cfg
parentUse more descriptive error code (diff)
parentMerge pull request #305 from matrix-org/markjh/v2_sync_api (diff)
downloadsynapse-f38df51e8dd8e462871c9bfb8fb49a89d157bf2d.tar.xz
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions