mirror of https://github.com/Siphonay/mastodon
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 | ||