From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 29 Jun 2021 22:42:52 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d1780fb9a4dbf3f458f9634b285294c0d674feb9;p=mastodon.git

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Removed upstream, while we had a checkbox telling people to check if the
  issue was present upstream. Removed the file as well.
---

d1780fb9a4dbf3f458f9634b285294c0d674feb9
diff --cc app/javascript/mastodon/initial_state.js
index 89b59051c,1389a3c3d..1307bf23e
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@@ -12,8 -12,8 +12,9 @@@ export const boostModal = getMeta('boos
  export const deleteModal = getMeta('delete_modal');
  export const me = getMeta('me');
  export const searchEnabled = getMeta('search_enabled');
 +export const maxChars = (initialState && initialState.max_toot_chars) || 500;
  export const invitesEnabled = getMeta('invites_enabled');
+ export const limitedFederationMode = getMeta('limited_federation_mode');
  export const repository = getMeta('repository');
  export const source_url = getMeta('source_url');
  export const version = getMeta('version');