summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:55:21 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:55:21 -0500
commitca6496c27c7219827826a58adf3d13c13c6cd53f (patch)
tree89b32bcf6e8e7b0357c209f2906f42e71d1e5277 /synapse/handlers/federation.py
parentMerge branch 'develop' into daniel/3pidinvites (diff)
parentUse space not dash as delimiter (diff)
downloadsynapse-ca6496c27c7219827826a58adf3d13c13c6cd53f.tar.xz
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to 'synapse/handlers/federation.py')
0 files changed, 0 insertions, 0 deletions