Merge branch 'master' into feature-circles

824d1b88 · Takeshi Umeda · GitHub · 6358072b · c747883d · 824d1b88
Unverified Commit 824d1b88 authored 4 years ago by Takeshi Umeda Committed by GitHub 4 years ago
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 2774 additions and 2474 deletions
+2774 -2474
--- a/spec/workers/activitypub/delivery_worker_spec.rb
+++ b/spec/workers/activitypub/delivery_worker_spec.rb
--- a/spec/workers/refollow_worker_spec.rb
+++ b/spec/workers/refollow_worker_spec.rb
--- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
--- a/streaming/index.js
+++ b/streaming/index.js
--- a/yarn.lock
+++ b/yarn.lock