diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-09-17 13:24:52 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-09-17 13:24:52 +0200 |
| commit | fb46d6fbc4cc7db183bc3998e4e64b15eae11135 (patch) | |
| tree | 7a0dc3c779ca0c0c656c48517a39fb8715320528 /lib | |
| parent | 422d0f324fa18743129ce81139319ead7cb579ce (diff) | |
| download | pleroma-fb46d6fbc4cc7db183bc3998e4e64b15eae11135.tar.gz | |
Prefer post-specific emoji.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 728d2b3e8..a5eb3b268 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -109,7 +109,7 @@ defmodule Pleroma.Formatter do def emojify(text, additional \\ nil) do all_emoji = if additional do - @emoji ++ Map.to_list(additional) + Map.to_list(additional) ++ @emoji else @emoji end |