d392020da6
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit. |
||
|---|---|---|
| .. | ||
| v2 | ||
| account_serializer.rb | ||
| application_serializer.rb | ||
| context_serializer.rb | ||
| credential_account_serializer.rb | ||
| custom_emoji_serializer.rb | ||
| filter_serializer.rb | ||
| instance_serializer.rb | ||
| list_serializer.rb | ||
| media_attachment_serializer.rb | ||
| mute_serializer.rb | ||
| notification_serializer.rb | ||
| preview_card_serializer.rb | ||
| relationship_serializer.rb | ||
| report_serializer.rb | ||
| search_serializer.rb | ||
| status_serializer.rb | ||
| tag_serializer.rb | ||
| web_push_subscription_serializer.rb | ||