d46668d34b
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”. |
||
|---|---|---|
| .. | ||
| about | ||
| accounts | ||
| admin | ||
| admin_mailer | ||
| application | ||
| auth | ||
| authorize_interactions | ||
| directories | ||
| errors | ||
| filters | ||
| follower_accounts | ||
| following_accounts | ||
| home | ||
| invites | ||
| kaminari | ||
| layouts | ||
| media | ||
| notification_mailer | ||
| oauth | ||
| public_timelines | ||
| relationships | ||
| remote_follow | ||
| remote_interaction | ||
| remote_unfollows | ||
| settings | ||
| shared | ||
| shares | ||
| stream_entries | ||
| tags | ||
| user_mailer | ||
| well_known | ||