mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 02:32:55 -05:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields