diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:21:26 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:21:26 -0400 |
commit | bc95890822cc1803f5ab7679b9986f56a46c7d33 (patch) | |
tree | dba9e1ac47bdce28c1346959d9562dbc2eecf903 /synapse/push/presentable_names.py | |
parent | allow uploading keys for cross-signing (diff) | |
parent | add changelog file (diff) | |
download | synapse-bc95890822cc1803f5ab7679b9986f56a46c7d33.tar.xz |
Merge branch 'cross-signing_hidden' into cross-signing_keys
Diffstat (limited to 'synapse/push/presentable_names.py')
0 files changed, 0 insertions, 0 deletions