cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2024aef 2efe711)

author	Claire <claire.github-309c@sitedethib.com>
	Thu, 27 May 2021 15:58:44 +0000 (17:58 +0200)
committer	Claire <claire.github-309c@sitedethib.com>
	Thu, 27 May 2021 15:58:44 +0000 (17:58 +0200)
commit	10a31a934fb62a95d6144794b9c449f1092593f0
tree	193863c7b8bbd25c77ea6489134db3cb9397ed3f	tree \| snapshot
parent	2024aef0f9b52297d814811f5825678a563f78ff	commit \| diff
parent	2efe711a517642cd7032aee318c85f6c158ee0ca	commit \| diff

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
Upstream's README got updated, but we have a completely different one.
Kept ours.

Gemfile	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