mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-22 19:47:33 +02: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”. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.js |