tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
0c6dfcf3de83ef9595b95c5d2d6fc116fe319861
Mastodon/app/javascript/mastodon/locales/ja.json
Claire 69737b703a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00

31 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink