mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 02:32:55 -05:00
9c3b9d5ab9
Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.