]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 28 Jan 2020 18:15:03 +0000 (19:15 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 28 Jan 2020 18:15:03 +0000 (19:15 +0100)
1  2 
Gemfile
Gemfile.lock
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
config/locales/en.yml

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
Simple merge