tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
a16ff45d81d77d93f33ad57e746c780392ab1a1c
Mastodon/app/controllers/settings/preferences_controller.rb
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

1.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink