]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
commit50544627592db864cfe9c7ddb138b299344f0d44
treece1d528ae605cc418303fb3268d0ccb2164b380e
parentd42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4
parenta2abe35e0f55c96e8b8525ee25089751859d14c2
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/views/statuses/_simple_status.html.haml