diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-08 13:45:21 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-08 13:45:21 +0100 |
commit | be59910b93252e83af348bcfd8781eed75fcb674 (patch) | |
tree | 3b9145795bff0076067070d7f1d4351cd7a622c3 /synapse/events | |
parent | Ability to whitelist specific threepids against monthly active user limiting (diff) | |
parent | Merge pull request #3633 from matrix-org/neilj/mau_tracker (diff) | |
download | synapse-be59910b93252e83af348bcfd8781eed75fcb674.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_users
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions