mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 03:33:40 +01:00
41a98b6543
Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |