mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-26 21:30:48 -04:00
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields