diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-05 07:56:36 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-05 07:56:36 +0300 |
| commit | e84fee5b8624c8909ddd8a7e0d99c6beea4f54d0 (patch) | |
| tree | d0d2bfc3d847f9bb4fa03f08d9d60f49042b2688 /lib/pleroma/activity.ex | |
| parent | 86e4d23acb640efea8cbc879ddbeadfa0e04f9c8 (diff) | |
| parent | a56db789359c7c7d57b45e6c68f791eeadc171e4 (diff) | |
| download | pleroma-e84fee5b8624c8909ddd8a7e0d99c6beea4f54d0.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to 'lib/pleroma/activity.ex')
| -rw-r--r-- | lib/pleroma/activity.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index b7be7a800..c9294a716 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -30,7 +30,8 @@ defmodule Pleroma.Activity do "Follow" => "follow", "Announce" => "reblog", "Like" => "favourite", - "Move" => "move" + "Move" => "move", + "EmojiReaction" => "pleroma:emoji_reaction" } @mastodon_to_ap_notification_types for {k, v} <- @mastodon_notification_types, |