]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 7 Mar 2019 12:24:30 +0000 (13:24 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 7 Mar 2019 12:24:30 +0000 (13:24 +0100)
1  2 
Gemfile.lock
app/javascript/mastodon/locales/pl.json

diff --cc Gemfile.lock
Simple merge