Merge branch 'mastoapi-omitted' into 'develop'
authorfeld <feld@feld.me>
Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)
committerfeld <feld@feld.me>
Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)
commit2e39fbe02ed31695abcf36e4b9aadcedde3d4a9e
treeffb342ecf688cba33200be069d49d65b907f9ede
parentbb275c49853ab54ce7c7c52152bf0a20c4dc1288
parent28d4e60f668ec5fa6c5be21ee28612d01b51a6a0
Merge branch 'mastoapi-omitted' into 'develop'

MastoAPI differences: Document not implemented features

See merge request pleroma/pleroma!2687