Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| custom_emoji_parser.rb | ||
| media_attachment_parser.rb | ||
| poll_parser.rb | ||
| status_parser.rb | ||
Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| custom_emoji_parser.rb | ||
| media_attachment_parser.rb | ||
| poll_parser.rb | ||
| status_parser.rb | ||