mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09:00
51631c785f
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 |