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

Closed polyamAdmin closed 1 month ago

polyamAdmin commented 1 month ago

Conflicts:

app/javascript/flavours/glitch/features/account_timeline/components/header.jsx Upstream removed router props, polyam-glitch had an additional prop. Removed as upstream

Ported Changes: