Merge upstream changes - Githubissues

polyamspace / mastodon

Custom Mastodon fork used by https://polyam.space

GNU Affero General Public License v3.0

1 stars 2 forks source link

Merge upstream changes #558

Closed polyamAdmin closed 2 months ago

polyamAdmin commented 2 months ago

Conflicts:

app/javascript/flavours/glitch/features/compose/components/search.jsx
app/javascript/mastodon/features/compose/components/search.jsx Upstream added import close to an extra import. Added import as upstream.
app/javascript/flavours/glitch/features/firehose/index.jsx Upstream removed an import on line with extra imports. Removed import upstream did.

Ported changes:

a178ba7cd5fa10b018ecaf3c8e3dd5f298a08818

Additional changes:

413f3fe63c8fe130a25e12e0d9eade0c609c8b06