]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 6 Oct 2021 14:46:32 +0000 (16:46 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 6 Oct 2021 14:46:32 +0000 (16:46 +0200)
1  2 
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb

Simple merge