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

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

Browse source 
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
This commit is contained in:
Egor Kislitsyn 2019-02-11 13:54:21 +07:00
commit 305d219413
481 changed files with 1398 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/salmon/salmon.ex
View file

@ -6,10 +6,12 @@ defmodule Pleroma.Web.Salmon do
@httpoison Application.get_env(:pleroma, :httpoison)
use Bitwise
alias Pleroma.Instances
alias Pleroma.User
alias Pleroma.Web.XML
alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.User
require Logger
def decode(salmon) do