abcba5c198
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc. |
||
|---|---|---|
| .. | ||
| admin | ||
| account_serializer.rb | ||
| application_serializer.rb | ||
| context_serializer.rb | ||
| conversation_serializer.rb | ||
| credential_account_serializer.rb | ||
| custom_emoji_serializer.rb | ||
| featured_tag_serializer.rb | ||
| filter_serializer.rb | ||
| identity_proof_serializer.rb | ||
| instance_serializer.rb | ||
| list_serializer.rb | ||
| marker_serializer.rb | ||
| media_attachment_serializer.rb | ||
| mute_serializer.rb | ||
| notification_serializer.rb | ||
| poll_serializer.rb | ||
| preferences_serializer.rb | ||
| preview_card_serializer.rb | ||
| relationship_serializer.rb | ||
| report_serializer.rb | ||
| scheduled_status_serializer.rb | ||
| search_serializer.rb | ||
| status_serializer.rb | ||
| tag_serializer.rb | ||
| web_push_subscription_serializer.rb | ||