summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-13 10:33:00 +0100
committerMark Haines <mark.haines@matrix.org>2015-10-13 10:33:00 +0100
commitf96b48067065b12654f60a7d8849eebeb5338a73 (patch)
tree1b9edd18e4e8c4f2218756b501292fde1fcb252e /synapse/__init__.py
parentStart spliting out the rooms into joined and invited in v2 sync (diff)
parentMerge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff)
downloadsynapse-f96b48067065b12654f60a7d8849eebeb5338a73.tar.xz
Merge branch 'develop' into markjh/v2_sync_api
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions