tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9a641a5a0e7a8d45bf6d3b8e4bfdc269def2dc06
Mastodon/app/javascript/mastodon/locales/defaultMessages.json
Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
2020-06-17 17:10:15 +02:00

79 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink