projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/mediaproxy-empty-url' into 'develop'
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index dd971df9b98d3b02694565633794f94f507723a6..26bb17377094340d69a0280086cc146ee4e85f83 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-29,8
+29,6
@@
defmodule Pleroma.Formatter do
|> Enum.filter(fn {_match, user} -> user end)
end
- @instance Application.get_env(:pleroma, :instance)
-
def emojify(text) do
emojify(text, Emoji.get_all())
end