tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ccbaf32bca8e053a67e1c919e296f045ed1eb2d8
Mastodon/app/javascript/mastodon/locales/en.json
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00

17 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink