ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |