diff options
| author | lain <lain@soykaf.club> | 2018-03-30 14:48:08 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-03-30 14:48:08 +0200 |
| commit | 480932c8e524e1a80c9c8ef1a1aa23379f633afe (patch) | |
| tree | 4b15635ab57c6641aa41dc7ba862faac40abe985 /lib | |
| parent | c1d529ee9491fc0040cd4327c783aabf76cb66a8 (diff) | |
| parent | b9ee17a8531e029dda2fa112e0cf814305808ec9 (diff) | |
| download | pleroma-480932c8e524e1a80c9c8ef1a1aa23379f633afe.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 70a7fa863..9428acd7e 100644 --- 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) |