Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.
This commit is contained in:
@@ -1257,6 +1257,23 @@
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Change language",
|
||||
"id": "compose.language.change"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Search languages...",
|
||||
"id": "compose.language.search"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Clear",
|
||||
"id": "emoji_button.clear"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/compose/components/language_dropdown.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user