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)
commit608824b97e05fbfe7e1b201b742717194737debd
treed58c7f4f600d59405c0fb38bcdd8ad25f5e4e05d
parent6b9bfc9e867ea49536d6fc38d674cdc2278778b8
parentc711a2b15761db9d2d30035e9fee0783f0bf77b0
Merge branch 'instance-docs' into 'develop'

AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API

Closes #1516

See merge request pleroma/pleroma!2931
CHANGELOG.md