Claire 4415005de7 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.		2022-05-16 22:29:05 +02:00
..
importer	…
push_notifications	…
account_notes.js	…
accounts.js	…
alerts.js	…
announcements.js	…
app.js	…
blocks.js	…
bookmarks.js	…
boosts.js	…
bundles.js	…
columns.js	…
compose.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 22:29:05 +02:00
conversations.js	…
custom_emojis.js	…
directory.js	…
domain_blocks.js	…
dropdown_menu.js	…
emojis.js	…
favourites.js	…
filters.js	…
height_cache.js	…
history.js	…
interactions.js	…
languages.js	…
lists.js	…
markers.js	…
modal.js	…
mutes.js	…
notifications.js	…
onboarding.js	…
picture_in_picture.js	…
pin_statuses.js	…
polls.js	…
reports.js	…
rules.js	…
search.js	…
settings.js	…
statuses.js	…
store.js	…
streaming.js	…
suggestions.js	…
timelines.js	…
trends.js	…