mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 11:41:35 +01: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. |
||
---|---|---|
.. | ||
appearance | ||
notifications | ||
other |