]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/main' into merge_glitch-soc_2022-03-30
authorsingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Wed, 30 Mar 2022 16:06:00 +0000 (16:06 +0000)
committersingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Wed, 30 Mar 2022 16:06:00 +0000 (16:06 +0000)
commit7a970679eab0aa739c92d5e3e1afb589d73656ce
treef75d506763f79cb129896ce9d90863ec4e706adf
parentb7da618a4589fde69abb23320c1aec264fd2433f
parent60f9973f452100475874cd9bd0a8b6ee908bf8e0
Merge remote-tracking branch 'origin/main' into merge_glitch-soc_2022-03-30
.env.production.sample
app/models/user.rb
lib/mastodon/version.rb
spec/models/user_spec.rb
yarn.lock