summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-02 15:33:28 +0100
committerDavid Baker <dave@matrix.org>2016-06-02 15:33:28 +0100
commit812b5de0feeb905643faf4decff3d7b566d3dbe9 (patch)
tree70c5d4a2dab2e35bc39711392cba52e22e5a145f /synapse/app
parentMerge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe (diff)
parentFix setting the _clock in SQLBaseStore (diff)
downloadsynapse-812b5de0feeb905643faf4decff3d7b566d3dbe9.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions