diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-08-02 10:18:15 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-08-02 10:18:15 +0100 |
commit | 54de6a812ae3d4ecefa9a1972afa8c114b6a5b9c (patch) | |
tree | 7a70b5d7cc8f01afccce3cded6e5413e1b0de8e8 /setup.py | |
parent | Fix adding emails on registration (diff) | |
parent | Merge pull request #970 from matrix-org/erikj/clock (diff) | |
download | synapse-54de6a812ae3d4ecefa9a1972afa8c114b6a5b9c.tar.xz |
Merge branch 'develop' into dbkr/fix_add_email_on_register
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions