about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/en.json
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-07-02 16:57:28 +0200
committerGitHub <noreply@github.com>2021-07-02 16:57:28 +0200
commit0c2eb949fc21ceecbd99a81e5ffe75517a1e64df (patch)
tree9ac6855c447939733d97b9650acb06e8c2b0ca8b /app/javascript/mastodon/locales/en.json
parentf4b9d94ce78761eb93c34333cbce5730da9ea97f (diff)
parent1e2097afd4d53c0b36bac9efba7d594725c5b8d9 (diff)
Merge pull request #1560 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/locales/en.json')
0 files changed, 0 insertions, 0 deletions