mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-13 19:54:01 -05:00
f8e07ca5cd
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
push_controller.rb | ||
salmon_controller.rb | ||
subscriptions_controller.rb |