mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 07:05:11 +01:00
8142bd2553
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
---|---|---|
.. | ||
assets.rake | ||
auto_annotate_models.rake | ||
db.rake | ||
emojis.rake | ||
glitchsoc.rake | ||
mastodon.rake | ||
statistics.rake |