mirror of
https://github.com/mastodon/mastodon.git
synced 2025-12-11 14:42:42 +00:00
Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering. |
||
|---|---|---|
| .. | ||
| index.js | ||