]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 1 Feb 2022 19:59:28 +0000 (20:59 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 1 Feb 2022 19:59:28 +0000 (20:59 +0100)
1  2 
app/models/user.rb
lib/mastodon/version.rb

Simple merge
Simple merge