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

Simple merge
Simple merge