diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-06 15:34:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-06 15:34:42 +0100 |
| commit | aa832d623ac0812a970ea90440c50fca9a7bb616 (patch) | |
| tree | 45ef2112a99163aba4a2f65c02ec1c7604b249a3 /app/javascript/skins/vanilla/win95 | |
| parent | 24d1ddcc24996d0b9de11fa725f0e15c78d59fba (diff) | |
| parent | 92658f0fb0cf6cb582126f41f7132bde80f77657 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.
Diffstat (limited to 'app/javascript/skins/vanilla/win95')
0 files changed, 0 insertions, 0 deletions