tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
be6885eb93c088699465d1c50e49e8ba6d9fa3a7
Mastodon/app/javascript/mastodon/locales/en.json
T
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00

21 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink