mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-21 00:29:47 +00:00
f8e07ca5cd
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
---|---|---|
.. | ||
extend.rb | ||
scoped_settings.rb |