]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1255ab 7f1c569)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 26 Jan 2021 13:01:30 +0000 (14:01 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 26 Jan 2021 13:01:30 +0000 (14:01 +0100)
commitb81710c02c9d8f27d417aa11b288a5b4e32bd5d5
tree2f5ba10c2eb3c667dab2dfdb77c3d1724677ce87tree | snapshot
parentd1255ab8a5101bc04af4a5214f975edf443a37d9commit | diff
parent7f1c56954b46b26b4dadfa92047f1ee5d7f9ad0acommit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.
CONTRIBUTING.md diff1 | diff2 | blob | history
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/lib/feed_manager.rb diff1 | diff2 | blob | history
app/lib/formatter.rb diff1 | diff2 | blob | history
app/lib/sanitize_config.rb diff1 | diff2 | blob | history
source code fur Kibicat Mastodon