Merge branch 'develop' into feature/admin-api-render-whole-status
authorMaxim Filippov <colixer@gmail.com>
Mon, 25 Nov 2019 15:25:43 +0000 (00:25 +0900)
committerMaxim Filippov <colixer@gmail.com>
Mon, 25 Nov 2019 15:25:43 +0000 (00:25 +0900)
commitb62be2564c1b3e33e51628e980c5d1ebe259475f
tree2c3664c743e03027ccc73fd10d43c0c7acd3fbc8
parentb3b4e5ca805780f278b6239973d6d497b1697fbd
parentdc9090810dbed74da91f2e94f23e5512d259e4fc
Merge branch 'develop' into feature/admin-api-render-whole-status
CHANGELOG.md
lib/pleroma/web/activity_pub/utils.ex
test/web/admin_api/admin_api_controller_test.exs