tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4e1efacfac29cbd4ba3ff675abaa923bb53fcbc8
Mastodon/app/javascript/mastodon/locales/ja.json
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00

29 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink