Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
7f6b0178a8
@ -121,7 +121,7 @@ final class AnimeCollection extends Collection {
|
|||||||
->join('media', 'media.id=a.media_id', 'inner')
|
->join('media', 'media.id=a.media_id', 'inner')
|
||||||
->order_by('media')
|
->order_by('media')
|
||||||
->order_by('title')
|
->order_by('title')
|
||||||
->group_by('a.hummingbird_id')
|
->group_by('a.hummingbird_id, media.type')
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
// Add genres associated with each item
|
// Add genres associated with each item
|
||||||
|
Loading…
Reference in New Issue
Block a user