diff options
author | rinpatch <rinpatch@sdf.org> | 2020-05-05 12:10:10 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-05-05 12:10:10 +0000 |
commit | 33f29760200e00305be20350898ebfd2b3ce21af (patch) | |
tree | 0b2917ebaf1c1395d088a09f58b851788a48e9d6 /rel | |
parent | 5482a1f6efdb771f586ed539ec8f57953a8fac69 (diff) | |
parent | d20152700470c9b84a9404193ff08dd6d90b97a3 (diff) | |
download | pleroma-33f29760200e00305be20350898ebfd2b3ce21af.tar.gz |
Merge branch 'feature/1737-magic-key-field' into 'develop'
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions