Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| activity | ||
| parser | ||
| adapter_spec.rb | ||
| dereferencer_spec.rb | ||
| linked_data_signature_spec.rb | ||
| tag_manager_spec.rb | ||
Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| activity | ||
| parser | ||
| adapter_spec.rb | ||
| dereferencer_spec.rb | ||
| linked_data_signature_spec.rb | ||
| tag_manager_spec.rb | ||