summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-08-02 10:18:15 +0100
committerMark Haines <mark.haines@matrix.org>2016-08-02 10:18:15 +0100
commit54de6a812ae3d4ecefa9a1972afa8c114b6a5b9c (patch)
tree7a70b5d7cc8f01afccce3cded6e5413e1b0de8e8 /contrib
parentFix adding emails on registration (diff)
parentMerge pull request #970 from matrix-org/erikj/clock (diff)
downloadsynapse-54de6a812ae3d4ecefa9a1972afa8c114b6a5b9c.tar.xz
Merge branch 'develop' into dbkr/fix_add_email_on_register
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions