]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'origin' into merge_glicth-soc_2022-01-31
authorsingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Thu, 3 Feb 2022 17:04:58 +0000 (17:04 +0000)
committersingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Thu, 3 Feb 2022 17:04:58 +0000 (17:04 +0000)
1  2 
app/models/user.rb
lib/mastodon/version.rb

Simple merge
Simple merge