mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-13 19:54:01 -05:00
8142bd2553
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
---|---|---|
.. | ||
v1 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb | ||
push_controller_spec.rb | ||
salmon_controller_spec.rb | ||
subscriptions_controller_spec.rb |