diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-06-23 11:17:48 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-06-23 11:17:48 +0100 |
commit | 05f1a4596a929930c6a4aca11133533f56030688 (patch) | |
tree | 9055c7a1731dca915a5f440d2d755450354ac2e1 /setup.py | |
parent | Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent (diff) | |
parent | Merge pull request #889 from matrix-org/markjh/synctl_workers (diff) | |
download | synapse-05f1a4596a929930c6a4aca11133533f56030688.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions