Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api

2018-05-26 16:00:59 +02:00 · 2018-05-26 16:00:59 +02:00 · 4b3ec53514
commit 4b3ec53514
parent 4fd9df100f 6138b29783
54 changed files with 1467 additions and 180 deletions
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@ -122,7 +122,8 @@ defmodule Pleroma.Factory do
    }

    %Pleroma.Activity{
-      data: data
+      data: data,
+      actor: follower.ap_id
    }
  end