Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 8 May 2020 18:37:55 +0000 (21:37 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 8 May 2020 18:37:55 +0000 (21:37 +0300)
commitb2924ab1fbba4e6add15030cf8444d2d3f0cfe0c
tree000420341c4397cb7e380ff6fa52bb023700476a
parentd5cdc907e3fda14c2ce78ddbb124739441330ecc
parent570940a3fd8d5a2fb600656432dfc01304161221
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
config/config.exs
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
test/web/mastodon_api/views/notification_view_test.exs
test/web/mastodon_api/views/status_view_test.exs