Merge branch 'instance-docs' into 'develop'
authorfeld <feld@feld.me>
Thu, 17 Sep 2020 16:54:53 +0000 (16:54 +0000)
committerfeld <feld@feld.me>
Thu, 17 Sep 2020 16:54:53 +0000 (16:54 +0000)
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API

Closes #1516

See merge request pleroma/pleroma!2931

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge