summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-05 20:52:15 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-05 20:52:15 -0500
commitddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b (patch)
treee88b15f55f6b46c19c8f3c4506489723d08b0977 /synapse/handlers/_base.py
parentRevert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" (diff)
parentPreserve version string in user agent (diff)
downloadsynapse-ddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b.tar.xz
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to 'synapse/handlers/_base.py')
0 files changed, 0 insertions, 0 deletions