mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-15 12:44:24 -05:00
8142bd2553
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
---|---|---|
.. | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
redis_config.rb | ||
snowflake.rb | ||
version.rb |