]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' of https://github.com/glitch-soc/mastodon into merge_glitch-soc_2...
authorsingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Wed, 30 Mar 2022 17:59:41 +0000 (17:59 +0000)
committersingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Wed, 30 Mar 2022 17:59:41 +0000 (17:59 +0000)
1  2 
app/models/user.rb
lib/mastodon/version.rb

Simple merge
Simple merge