Commit b9ee17a8 authored by lain's avatar lain

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

Add char_limit to initial-state of mastofe

See merge request pleroma/pleroma!86
parents f8f3abe1 457e0404
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment