]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 6 Mar 2019 10:29:06 +0000 (11:29 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 6 Mar 2019 10:29:06 +0000 (11:29 +0100)
1  2 
Gemfile
Gemfile.lock
app/javascript/mastodon/features/compose/components/compose_form.js
config/locales/en.yml

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