Merge branch 'master' into dark-mode

This commit is contained in:
Dan Brown 2020-04-11 14:22:41 +01:00
commit 067cb9c5b7
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9

View file

@ -122,7 +122,7 @@ class ActivityService
->where('user_id', '=', $user->id) ->where('user_id', '=', $user->id)
->skip($count * $page) ->skip($count * $page)
->take($count) ->take($count)
->get()->toArray(); ->get();
return $this->filterSimilar($activityList); return $this->filterSimilar($activityList);
} }