diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 17:55:00 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 17:55:00 +0700 |
| commit | ddd4a09b72ede65345ddf45a68eb239b54eda86c (patch) | |
| tree | 020bf8fa0ba54dd2690d2300c3dae94f3de2622f | |
| parent | cfa5572d28a5a7b58d73106c32420b14ffd9fd2a (diff) | |
| download | pleroma-ddd4a09b72ede65345ddf45a68eb239b54eda86c.tar.gz | |
Fix merge conflict
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 22ce1ea90..6c9e117ae 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -98,6 +98,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do end end + def get_to_and_cc(_user, _mentions, _inReplyTo, _), do: {[], []} + def get_addressed_users(_, to) when is_list(to) do User.get_ap_ids_by_nicknames(to) end |