mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
941a9df28a
Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
workflows | ||
FUNDING.yml | ||
renovate.json5 | ||
stale.yml | ||
stylelint-matcher.json |