mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
exports | ||
two_factor_authentication | ||
applications_controller_spec.rb | ||
deletes_controller_spec.rb | ||
exports_controller_spec.rb | ||
flavours_controller_spec.rb | ||
follower_domains_controller_spec.rb | ||
imports_controller_spec.rb | ||
keyword_mutes_controller_spec.rb | ||
migrations_controller_spec.rb | ||
notifications_controller_spec.rb | ||
preferences_controller_spec.rb | ||
profiles_controller_spec.rb | ||
sessions_controller_spec.rb | ||
two_factor_authentications_controller_spec.rb |