tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
91e6df70266bd475c3d4ef2b411f42cff805bd47
Mastodon/app/javascript/mastodon/locales/ja.json
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00

36 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink