]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'origin' into merge_glich-soc_2021-12-20
authorsingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Tue, 21 Dec 2021 00:33:51 +0000 (00:33 +0000)
committersingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Tue, 21 Dec 2021 00:33:51 +0000 (00:33 +0000)
1  2 
.env.production.sample
app/models/user.rb
lib/mastodon/version.rb
yarn.lock

Simple merge
Simple merge
Simple merge
diff --cc yarn.lock
Simple merge