hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into fix/twittercards

Browse source
This commit is contained in:
Mark Felder 2019-02-19 16:58:28 +00:00
commit 2d21ea1a0e
82 changed files with 1316 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/ostatus/ostatus_controller.ex
View file

@ -87,7 +87,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
{:ok, body, _conn} = read_body(conn)
{:ok, doc} = decode_or_retry(body)
Federator.enqueue(:incoming_doc, doc)
Federator.incoming_doc(doc)
conn
|> send_resp(200, "")