tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
598888a7c45a5ccbf7debfc0cdc630232b9cfce6
Mastodon/app/javascript/mastodon/locales/en.json
Claire 9765d2b3f8 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream changed headers, and we have different ones.
  Ported upstream's change.
2023-01-10 09:39:15 +01:00

41 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink