Merge branch 'develop' into hide-muted-reactions
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 17 Nov 2020 14:29:52 +0000 (18:29 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 17 Nov 2020 14:29:52 +0000 (18:29 +0400)
commit79d2d3f609ccb14c532ada6fbaf600224f8e4f07
tree9bd591d0920c13256f9cb76bd4a7035ed1afaaa6
parentfb41bd1a85b0bcf41a306a0f89307ed80029bc04
parentfbd6217ed9e07fb0353263566e2978b5a2396189
Merge branch 'develop' into hide-muted-reactions
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs