diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 20:04:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 20:04:23 +0100 |
| commit | 8c9c05d57914236dc7104a67e84743e1ce36f7cc (patch) | |
| tree | 645c19df410f74da25f2531d140013e90b930de4 /app/lib | |
| parent | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (diff) | |
| parent | 55692978ecb1f3fc9049f976de5764b7a24f4de9 (diff) | |
Merge pull request #1700 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 7f2bc42d3..2c16689bd 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -549,7 +549,7 @@ class FeedManager end else # A reblog may reach earlier than the original status because of the - # delay of the worker deliverying the original status, the late addition + # delay of the worker delivering the original status, the late addition # by merging timelines, and other reasons. # If such a reblog already exists, just do not re-insert it into the feed. return false unless redis.zscore(reblog_key, status.id).nil? |