Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
29 KiB
29 KiB
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields