projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mastoapi-media-timeline' into 'develop'
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index 7ccd7e7bb8bdcad4dbfa7ab2020ef670e3f43949..27e2adc16b7298d0ed9d117a23abc0a4e2bd258d 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-125,6
+125,5
@@
defmodule Pleroma.Formatter do
def get_custom_emoji() do
@emoji
- |> Enum.into %{}
end
end