Looking at upcoming changes, the next upstream merges will be painful, so doing this now.
Conflicts:
app/javascript/flavours/glitch/components/media_gallery.jsx
Upstream modified line which was modified for polyam-glitch's alt button.
Ported upstream's change.
config/routes/api.rb
Upstream refactored code. Polyam-glitch had an extra route for pinned accounts.
Refactored like upstream.
Looking at upcoming changes, the next upstream merges will be painful, so doing this now.
Conflicts:
app/javascript/flavours/glitch/components/media_gallery.jsxUpstream modified line which was modified for polyam-glitch's alt button. Ported upstream's change.config/routes/api.rbUpstream refactored code. Polyam-glitch had an extra route for pinned accounts. Refactored like upstream.Ported changes:
Additional changes: