]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 21 Dec 2020 17:28:23 +0000 (18:28 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 21 Dec 2020 17:28:23 +0000 (18:28 +0100)
1  2 
app/models/user.rb
app/services/batched_remove_status_service.rb

Simple merge