Merge branch 'feature/1737-magic-key-field' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 5 May 2020 12:10:10 +0000 (12:10 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 5 May 2020 12:10:10 +0000 (12:10 +0000)
commit33f29760200e00305be20350898ebfd2b3ce21af
tree0b2917ebaf1c1395d088a09f58b851788a48e9d6
parent5482a1f6efdb771f586ed539ec8f57953a8fac69
parentd20152700470c9b84a9404193ff08dd6d90b97a3
Merge branch 'feature/1737-magic-key-field' into 'develop'

User, Webfinger: Remove OStatus vestiges

Closes #1737

See merge request pleroma/pleroma!2471