ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
assets | ||
devise | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
assets | ||
devise | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |