Claire 82eebd0482 Merge commit '41a505513f' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		2023-07-12 15:27:32 +02:00
..
importer
push_notifications
account_notes.js
accounts.js
alerts.js	Add toast with option to open post after publishing in web UI (#25564)	2023-07-08 20:01:08 +02:00
announcements.js
app.ts
blocks.js
bookmarks.js
boosts.js
bundles.js
columns.js
compose.js	Merge commit '41a505513f' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
conversations.js
custom_emojis.js
directory.js
domain_blocks.js
dropdown_menu.js
emojis.js
favourites.js
featured_tags.js
filters.js
height_cache.js
history.js
interactions.js
languages.js
lists.js
markers.js
modal.ts
mutes.js
notifications.js
onboarding.js
picture_in_picture.js
pin_statuses.js
polls.js
reports.js
search.js
server.js	Prevent duplicate concurrent calls of /api/*/instance in web UI (#25663)	2023-07-02 11:12:16 +02:00
settings.js
statuses.js
store.js
streaming.js
suggestions.js
tags.js
timelines.js
trends.js