summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-17 10:43:58 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-17 10:43:58 +0100
commit523d5bcd0b4883c5046e52d62db59ff588e342c1 (patch)
tree2e03fdf537731d9a8d1e8f7a0feaaeb0c9d84eb8 /synapse/config
parentMove SyncHandler out of the Handlers object (diff)
parentMerge pull request #786 from matrix-org/matthew/email_notifs_tuning (diff)
downloadsynapse-523d5bcd0b4883c5046e52d62db59ff588e342c1.tar.xz
Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions