mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 06:28:07 +01:00
ab2f0daa10
Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web |