mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-21 01:21:41 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/settings/preferences
History
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
..
show.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-21 20:49:57 +02:00