Merge branch 'develop' into feature/activitypub

This commit is contained in:
lain 2018-02-12 10:24:15 +01:00
commit b331cb449a
36 changed files with 139 additions and 115 deletions

View file

@ -0,0 +1,6 @@
defmodule Pleroma.Web.OStatusMock do
import Pleroma.Factory
def handle_incoming(_doc) do
insert(:note_activity)
end
end