Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Sat, 7 Mar 2020 09:41:37 +0000 (12:41 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Sat, 7 Mar 2020 09:41:37 +0000 (12:41 +0300)
commitb2eb1124d115beda0907121c3c6f10783b34f352
tree87d2732555f3ac45ff5ef699064137d5fcaffafb
parent5f42ecc4c74172b1b17c126106fda9da24065b11
parent6d797b99282ff1067c6af04b3e1775ff2281333b
Merge branch 'develop' into gun
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/config/transfer_task.ex
restarter/lib/pleroma.ex
test/web/admin_api/admin_api_controller_test.exs