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. |
||
|---|---|---|
| .. | ||
| accept_follow_serializer.rb | ||
| activity_serializer.rb | ||
| actor_serializer.rb | ||
| add_serializer.rb | ||
| block_serializer.rb | ||
| collection_serializer.rb | ||
| delete_actor_serializer.rb | ||
| delete_serializer.rb | ||
| emoji_serializer.rb | ||
| flag_serializer.rb | ||
| follow_serializer.rb | ||
| image_serializer.rb | ||
| like_serializer.rb | ||
| move_serializer.rb | ||
| note_serializer.rb | ||
| outbox_serializer.rb | ||
| public_key_serializer.rb | ||
| reject_follow_serializer.rb | ||
| remove_serializer.rb | ||
| undo_announce_serializer.rb | ||
| undo_block_serializer.rb | ||
| undo_follow_serializer.rb | ||
| undo_like_serializer.rb | ||
| update_poll_serializer.rb | ||
| update_serializer.rb | ||
| vote_serializer.rb | ||