mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-21 04:07:33 +02:00
8142bd2553
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |