sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-28 00:25:02 +01:00
Code Issues Releases Wiki Activity

Merge branch 'char-limit-mastofe' into 'develop'

Browse Source 
Add char_limit to initial-state of mastofe

See merge request pleroma/pleroma!86
This commit is contained in:
lambda 2018-03-30 06:31:06 +00:00
commit b9ee17a853
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -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)