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

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

View file

@ -564,7 +564,8 @@ def index(%{assigns: %{user: user}} = conn, _params) 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)