mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 12:30:16 -05:00
f513317ba2
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| ostatus | ||
| settings | ||
| delivery_failure_tracker_spec.rb | ||
| extractor_spec.rb | ||
| feed_manager_spec.rb | ||
| formatter_spec.rb | ||
| hash_object_spec.rb | ||
| language_detector_spec.rb | ||
| request_spec.rb | ||
| status_filter_spec.rb | ||
| status_finder_spec.rb | ||
| tag_manager_spec.rb | ||
| user_settings_decorator_spec.rb | ||
| webfinger_resource_spec.rb | ||