Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

2018-03-30 14:48:08 +02:00 · 2018-03-30 14:48:08 +02:00 · 480932c8e5
commit 480932c8e5
parent c1d529ee94 b9ee17a853
2 changed files with 9 additions and 2 deletions
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@ -564,7 +564,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
        },
        push_subscription: nil,
        accounts: accounts,
-        custom_emojis: mastodon_emoji
+        custom_emojis: mastodon_emoji,
+        char_limit: Keyword.get(@instance, :limit)
      } |> Jason.encode!
      conn
      |> put_layout(false)