Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency. |
||
|---|---|---|
| .. | ||
| custom_emoji_parser.rb | ||
| media_attachment_parser.rb | ||
| poll_parser.rb | ||
| status_parser.rb | ||
Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency. |
||
|---|---|---|
| .. | ||
| custom_emoji_parser.rb | ||
| media_attachment_parser.rb | ||
| poll_parser.rb | ||
| status_parser.rb | ||