Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 17 Oct 2020 14:53:47 +0000 (17:53 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 17 Oct 2020 14:53:47 +0000 (17:53 +0300)
commit9ea31b373fdb75bb6aa04d006e5f493158897efa
treeb7301d21a9bc675984bb11b40c96148c0205270e
parenta859d9bc15cd1e4ff15bb63d6c114f71783118ef
parent023f726d7f497705d766adee8874b94efb08a0aa
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
config/config.exs
lib/pleroma/application.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
mix.exs
mix.lock
test/pleroma/notification_test.exs
test/pleroma/web/activity_pub/activity_pub_test.exs
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
test/pleroma/web/pleroma_api/controllers/mascot_controller_test.exs