]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
commita945182b568d7aebd6b181b60f58b1e1880746c7
tree6e84e0708e5e32fdcbf7c99e136882c1f809e252
parent988f5bf0266483659b03f1b0926d0b9ff9e85a8f
parent91616004fe52805f9602aa444549486e4ef17839
Merge branch 'main' into glitch-soc/merge-upstream
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/views/admin/instances/show.html.haml