Merge branch 'mastodon-emoji-endpoint' into 'develop'

Add mastodon API endpoint for custom emoji. See merge request pleroma/pleroma!8
2017-11-07 20:01:15 +00:00 · 2017-11-07 20:01:15 +00:00 · be67db5547
commit be67db5547
parent d761b1543a c6210183e1
4 changed files with 15 additions and 2 deletions
--- 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