diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
| commit | 07126e43a4db2d898e015186902031c8311093cb (patch) | |
| tree | 56c45f6cafd6ceaae2341b07de65c294327cd365 /synapse/server.py | |
| parent | remove white space (diff) | |
| parent | fix branch regexp (diff) | |
| download | synapse-07126e43a4db2d898e015186902031c8311093cb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions