]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 13 Nov 2018 15:28:07 +0000 (16:28 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 13 Nov 2018 15:28:07 +0000 (16:28 +0100)
1  2 
Gemfile
Gemfile.lock
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
This page took 0.049753 seconds and 3 git commands to generate.