tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
5ccd011cc3bafc00a557dabbb47da004f3d4a381
Mastodon/config/locales/ja.yml
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00

60 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink