mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-13 02:26:30 +00:00
89bee860cd
Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update. |
||
---|---|---|
.. | ||
index.js |