]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 24d1ddc 92658f0)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sun, 6 Feb 2022 14:34:42 +0000 (15:34 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sun, 6 Feb 2022 14:34:42 +0000 (15:34 +0100)
commitaa832d623ac0812a970ea90440c50fca9a7bb616
tree45ef2112a99163aba4a2f65c02ec1c7604b249a3tree | snapshot
parent24d1ddcc24996d0b9de11fa725f0e15c78d59fbacommit | diff
parent92658f0fb0cf6cb582126f41f7132bde80f77657commit | 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.
.github/workflows/build-image.yml diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon