diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-14 14:32:18 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-14 14:32:18 +0100 |
commit | e25d87d97bb88cb2583f0419fce34b5d5907b76e (patch) | |
tree | f160d7a2ef17dfd398d3be9883985cb371eb61be /synapse/server.py | |
parent | Dockerised sytest (#3660) (diff) | |
parent | rename _user_last_seen_monthly_active (diff) | |
download | synapse-e25d87d97bb88cb2583f0419fce34b5d5907b76e.tar.xz |
Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions