diff options
author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
---|---|---|
committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/res | |
parent | pep8 (diff) | |
parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/res')
0 files changed, 0 insertions, 0 deletions