Merge remote-tracking branch 'upstream/develop' into noyuno

2 jobs for noyuno in 2 minutes and 54 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Lint
failed #5204
lint

00:02:54

 
  Test
skipped #5205
unit-testing
 
Name Stage Failure
failed
lint Lint

warning: clauses for the same def should be grouped together, def post/3 was previously defined (test/support/httpoison_mock.ex:380)
test/support/httpoison_mock.ex:746


== Compilation error in file lib/pleroma/web/activity_pub/activity_pub.ex ==
** (SyntaxError) lib/pleroma/web/activity_pub/activity_pub.ex:445: found an unexpected version control marker, please resolve the conflicts: <<<<<<< HEAD
(elixir) lib/kernel/parallel_compiler.ex:198: anonymous fn/4 in Kernel.ParallelCompiler.spawn_workers/6
ERROR: Job failed: exit code 1