summary refs log tree commit diff
path: root/synapse/federation/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-02-26 13:40:25 +0000
committerDavid Baker <dave@matrix.org>2016-02-26 13:40:25 +0000
commit413e36b17afd49d0383cbfd8b8104e9f52a35d98 (patch)
tree8f9fad5d45310e0acf5059e5867a57b5889e694b /synapse/federation/__init__.py
parentEmpty to commit to force re-test (diff)
parentMerge pull request #608 from gergelypolonkai/syn-638 (diff)
downloadsynapse-413e36b17afd49d0383cbfd8b8104e9f52a35d98.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_event
Diffstat (limited to 'synapse/federation/__init__.py')
0 files changed, 0 insertions, 0 deletions