mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-28 11:09:37 +00: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. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
CODEOWNERS | ||
FUNDING.yml | ||
stale.yml |