]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 26 Mar 2019 16:39:20 +0000 (17:39 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 26 Mar 2019 16:39:20 +0000 (17:39 +0100)
1  2 
app/javascript/styles/mastodon/components.scss
config/locales/en.yml

Simple merge