mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
20d01a954e
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”. |
||
---|---|---|
.. | ||
show.html.haml |