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

Merge branch 'develop' into 'reactions'

Browse source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
lain 2019-10-06 08:11:47 +00:00
commit 61097ba6ab
28 changed files with 592 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/activity_pub/utils.ex
View file

@ -830,6 +830,6 @@ defmodule Pleroma.Web.ActivityPub.Utils do
|> Repo.all()
end
defp maybe_put(map, _key, nil), do: map
defp maybe_put(map, key, value), do: Map.put(map, key, value)
def maybe_put(map, _key, nil), do: map
def maybe_put(map, key, value), do: Map.put(map, key, value)
end