mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-29 08:37:14 +00:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
|---|---|---|
| .. | ||
| accounts | ||
| apps | ||
| instances | ||
| lists | ||
| push | ||
| statuses | ||
| timelines | ||
| accounts_controller.rb | ||
| apps_controller.rb | ||
| blocks_controller.rb | ||
| bookmarks_controller.rb | ||
| custom_emojis_controller.rb | ||
| domain_blocks_controller.rb | ||
| favourites_controller.rb | ||
| follow_requests_controller.rb | ||
| follows_controller.rb | ||
| instances_controller.rb | ||
| lists_controller.rb | ||
| media_controller.rb | ||
| mutes_controller.rb | ||
| notifications_controller.rb | ||
| reports_controller.rb | ||
| search_controller.rb | ||
| statuses_controller.rb | ||
| streaming_controller.rb | ||