]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sat, 26 Feb 2022 20:15:37 +0000 (21:15 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sat, 26 Feb 2022 20:15:37 +0000 (21:15 +0100)
1  2 
app/javascript/styles/mastodon/admin.scss
app/views/admin/reports/show.html.haml