mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 00:46:12 +00:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb |