Merge branch 'instance-docs' into 'develop'
authorfeld <feld@feld.me>
Thu, 17 Sep 2020 16:54:53 +0000 (16:54 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 4 Nov 2020 14:00:50 +0000 (17:00 +0300)
commit49b43e668eb208a95a621f667f72f41b69bc10e5
treeeb5b7b1d35d8654b85293de44aea165a6ef95a3c
parentfa6ad67397bd951d3e7f65ac3ac5ed6a3ee9b4c4
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
test/web/admin_api/controllers/instance_document_controller_test.exs [new file with mode: 0644]