mirror of https://github.com/glitch-soc/mastodon
c2817c7fad
Conflicts: - `app/lib/feed_manager.rb`: Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Conflict is due to glitch-soc having an extra timeline type (direct). Ported upstream's changes. - `app/workers/feed_insert_worker.rb`: Ditto. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
oembed_spec.rb |