projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hide-blocked-from-interaction' into 'develop'
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index 6db41fe6e36e9882f91649a98dff3a50e8440dbf..46552c7be67a25465dbdaab02a1f46013ce3b166 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-344,5
+344,5
@@
defmodule Pleroma.Activity do
)
end
)
end
- defdelegate search(user, query), to: Pleroma.Activity.Search
+ defdelegate search(user, query
, options \\ []
), to: Pleroma.Activity.Search
end
end