8bd7b9b586
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
applications | ||
deletes | ||
exports | ||
flavours | ||
follower_domains | ||
imports | ||
keyword_mutes | ||
migrations | ||
notifications | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentications |